Update to newer Android Lint and suppress new Lint errors

net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

 // Copyright 2012 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.net;
 
 import static android.net.ConnectivityManager.TYPE_VPN;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;
 import static android.net.NetworkCapabilities.TRANSPORT_VPN;
@@ skipping 332 matching lines @@
         }
 
         // For testing.
         WifiManagerDelegate() {
             // All the methods below should be overridden.
             mContext = null;
         }
 
         // Lazily determine if app has ACCESS_WIFI_STATE permission.
         @GuardedBy("mLock")
+        @SuppressLint("WifiManagerPotentialLeak")
         private boolean hasPermissionLocked() {
             if (mHasWifiPermissionComputed) {
                 return mHasWifiPermission;
             }
             mHasWifiPermission = mContext.getPackageManager().checkPermission(
                                          permission.ACCESS_WIFI_STATE, mContext.getPackageName())
                     == PackageManager.PERMISSION_GRANTED;
+            // TODO(crbug.com/635567): Fix lint properly.
             mWifiManager = mHasWifiPermission
                     ? (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE)
                     : null;
             mHasWifiPermissionComputed = true;
             return mHasWifiPermission;
         }
 
         String getWifiSsid() {
             // Synchronized because this method can be called on multiple threads (e.g. UI thread
             // from a private caller, and another thread calling a public API like
@@ skipping 677 matching lines @@
             return network.getNetworkHandle();
         } else {
             // NOTE(pauljensen): This depends on Android framework implementation details. These
             // details cannot change because Lollipop is long since released.
             // NetIDs are only 16-bit so use parseInt. This function returns a long because
             // getNetworkHandle() returns a long.
             return Integer.parseInt(network.toString());
         }
     }
 }