Merge "Add modules-utils-os to service-connectivity" am: 512857e29a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22df4afec8f8b5024d099966c0ca0f78b55ff08a

service/Android.bp

@@ -63,6 +63,7 @@ java_library {
         "unsupportedappusage",
     ],
     static_libs: [
+        "modules-utils-os",
         "net-utils-device-common",
         "net-utils-framework-common",
         "netd-client",

service/jarjar-rules.txt

@@ -1 +1,2 @@
-rule com.android.net.module.util.** com.android.connectivity.util.@1
+rule com.android.net.module.util.** com.android.connectivity.net-utils.@1
+rule com.android.modules.utils.** com.android.connectivity.modules-utils.@1