Merge "Expose netId to SystemApi" am: 1d379ac065

am: 1952cb5129

Change-Id: I23f6428954d08761d9671b419887d58dd29171fd

api/system-current.txt

@@ -4194,6 +4194,7 @@ package android.net {
   public class Network implements android.os.Parcelable {
     ctor public Network(@NonNull android.net.Network);
     method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
+    field public final int netId;
   }
 
   public final class NetworkCapabilities implements android.os.Parcelable {

core/java/android/net/Network.java

@@ -63,7 +63,7 @@ public class Network implements Parcelable {
     /**
      * @hide
      */
-    @UnsupportedAppUsage
+    @SystemApi
     public final int netId;
 
     // Objects used to perform per-network operations such as getSocketFactory