Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5

Change-Id: I69f1061972af362560a274084c94428b57bd46e8

core/java/android/net/NetworkCapabilities.java

@@ -920,7 +920,7 @@ public final class NetworkCapabilities implements Parcelable {
      * empty unless the destination is 1) the System Server, or 2) Telephony. In either case, the
      * receiving entity must have the ACCESS_FINE_LOCATION permission and target R+.
      */
-    private int[] mAdministratorUids = new int[0];
+    @NonNull private int[] mAdministratorUids = new int[0];
 
     /**
      * Sets the int[] of UIDs that are administrators of this network.

services/core/java/com/android/server/ConnectivityService.java

@@ -7983,11 +7983,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
 
         // Administrator UIDs also contains the Owner UID
         final int[] administratorUids = nai.networkCapabilities.getAdministratorUids();
-        for (final int uid : administratorUids) {
-            if (uid == callbackUid) return true;
-        }
-
-        return false;
+        return ArrayUtils.contains(administratorUids, callbackUid);
     }
 
     @Override