Update to newer Android Lint and suppress new Lint errors

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.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.sync;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
@@ skipping 37 matching lines @@
     /**
      * An identifier for the generator in UniqueIdentificationGeneratorFactory to be used to
      * generate the sync sessions ID. The generator is registered in the Application's onCreate
      * method.
      */
     public static final String GENERATOR_ID = "SYNC";
 
     @VisibleForTesting
     public static final String SESSION_TAG_PREFIX = "session_sync";
 
+    // TODO(crbug.com/635567): Fix this properly.
+    @SuppressLint("StaticFieldLeak")
     private static SyncController sInstance;
     private static boolean sInitialized;
 
     private final Context mContext;
     private final ChromeSigninController mChromeSigninController;
     private final ProfileSyncService mProfileSyncService;
     private final SyncNotificationController mSyncNotificationController;
 
     private SyncController(Context context) {
         mContext = context;
@@ skipping 159 matching lines @@
                 UniqueIdentificationGeneratorFactory.getInstance(GENERATOR_ID);
         String uniqueTag = generator.getUniqueId(null);
         if (uniqueTag.isEmpty()) {
             Log.e(TAG, "Unable to get unique tag for sync. "
                     + "This may lead to unexpected tab sync behavior.");
             return;
         }
         mProfileSyncService.setSessionsId(SESSION_TAG_PREFIX + uniqueTag);
     }
 }