Merge "Use the network stack shims in services connectivity" am: 6c24db946d am: 46ff4399f6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961300

Change-Id: I2a51baad1b5bec4cbbdbc5e93a6c773d20366cbd

service/Android.bp

@@ -110,6 +110,7 @@ java_library {
         "networkstack-client",
         "PlatformProperties",
         "service-connectivity-protos",
+        "NetworkStackApiStableShims",
     ],
     apex_available: [
         "com.android.tethering",

service/jarjar-rules.txt

@@ -94,5 +94,8 @@ rule android.net.util.NetworkConstants* com.android.connectivity.@0
 rule com.android.internal.util.IState* com.android.connectivity.@0
 rule com.android.internal.util.State* com.android.connectivity.@0
 
+# From the API shims
+rule com.android.networkstack.apishim.** com.android.connectivity.@0
+
 # Remaining are connectivity sources in com.android.server and com.android.server.connectivity:
 # TODO: move to a subpackage of com.android.connectivity (such as com.android.connectivity.server)