Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173d225caf28c63a7cccbaf090c783775a6e01ec

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