Update to newer Android Lint and suppress new Lint errors

chrome/android/java/src/org/chromium/chrome/browser/tab/TabIdManager.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.tab;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Maintains a monotonically increasing ID that is used for uniquely identifying {@link Tab}s.  This
  * class is responsible for ensuring that Tabs created in the same process, across every
  * {@link TabModel}, are allocated a unique ID.  Note that only the browser process should be
  * generating Tab IDs to prevent collisions.
  *
  * Calling {@link TabIdManager#incrementIdCounterTo(int)} will ensure new {@link Tab}s get IDs
  * greater than or equal to the parameter passed to that method.  This should be used when doing
  * things like loading persisted {@link Tab}s from disk on process start to ensure all new
  * {@link Tab}s don't have id collision.
  *
  * TODO(dfalcantara): Tab ID generation prior to M45 is haphazard and dependent on which Activity is
  *                    started first.  Unify the ways the maximum Tab ID is set (crbug.com/502384).
  */
 public class TabIdManager {
     @VisibleForTesting
     public static final String PREF_NEXT_ID =
             "org.chromium.chrome.browser.tab.TabIdManager.NEXT_ID";
 
     private static final Object INSTANCE_LOCK = new Object();
+    // TODO(crbug.com/635567): Fix this properly.
+    @SuppressLint("StaticFieldLeak")
     private static TabIdManager sInstance;
 
     private final Context mContext;
     private final AtomicInteger mIdCounter = new AtomicInteger();
 
     private SharedPreferences mPreferences;
 
     /** Returns the Singleton instance of the TabIdManager. */
     public static TabIdManager getInstance() {
         return getInstance(ContextUtils.getApplicationContext());
@@ skipping 42 matching lines @@
     private TabIdManager(Context context) {
         mContext = context;
 
         // Read the shared preference.  This has to be done on the critical path to ensure that the
         // myriad Activities that serve as entries into Chrome are all synchronized on the correct
         // maximum Tab ID.
         mPreferences = ContextUtils.getAppSharedPreferences();
         mIdCounter.set(mPreferences.getInt(PREF_NEXT_ID, 0));
     }
 }