Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178 am: 9f801155e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026

Change-Id: I437836e039e52460d0078647febcaed4f8c2f37f

tests/cts/net/Android.bp

@@ -36,19 +36,20 @@ java_defaults {
         "src/**/*.java",
         "src/**/*.kt",
     ],
-
+    jarjar_rules: "jarjar-rules-shared.txt",
     static_libs: [
         "FrameworksNetCommonTests",
         "TestNetworkStackLib",
-        "core-tests-support",
         "compatibility-device-util-axt",
+        "core-tests-support",
         "cts-net-utils",
         "ctstestrunner-axt",
         "ctstestserver",
-        "mockwebserver",
         "junit",
         "junit-params",
         "libnanohttpd",
+        "mockwebserver",
+        "net-utils-framework-common",
         "truth-prebuilt",
     ],
 

tests/cts/net/jarjar-rules-shared.txt

@@ -0,0 +1,2 @@
+# Module library in frameworks/libs/net
+rule com.android.net.module.util.** android.net.cts.util.@1