Merge "Add OEM_PAID capability to system api" into pi-dev

am: 62e4efeee2

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa

core/java/android/net/NetworkCapabilities.java

@@ -17,6 +17,7 @@
 package android.net;
 
 import android.annotation.IntDef;
+import android.annotation.SystemApi;
 import android.net.ConnectivityManager.NetworkCallback;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -276,6 +277,7 @@ public final class NetworkCapabilities implements Parcelable {
      * this network can be used by system apps to upload telemetry data.
      * @hide
      */
+    @SystemApi
     public static final int NET_CAPABILITY_OEM_PAID = 22;
 
     private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;