Merge "Use an in-process APK for in-process NetworkStack"

diff --cc packages/NetworkStack/tests/Android.bp
index e64f284,690c2cf..aadf99e
--- 1/packages/NetworkStack/tests/Android.bp
--- 2/packages/NetworkStack/tests/Android.bp
+++ b/packages/NetworkStack/tests/Android.bp
@@@ -22,8 -22,9 +22,8 @@@ android_test 
      resource_dirs: ["res"],
      static_libs: [
          "androidx.test.rules",
 -        "frameworks-base-testutils",
          "mockito-target-extended-minus-junit4",
-         "NetworkStackLib",
+         "NetworkStackBase",
          "testables",
      ],
      libs: [

diff --cc services/net/java/android/net/NetworkStackClient.java
Simple merge