Merge "Adjust visibility rules for migration" am: d938444667 am: ffcaf9ec9e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I904fc7ce0de68c03d629b4af4eb0ff9d3258198a

Android.bp

@@ -1264,7 +1264,10 @@ filegroup {
         "core/java/com/android/internal/util/StateMachine.java",
         "core/java/com/android/internal/util/WakeupMessage.java",
     ],
-    visibility: ["//frameworks/opt/net/wifi/service"],
+    visibility: [
+        "//frameworks/opt/net/wifi/service",
+        "//packages/modules/Wifi/service",
+    ],
 }
 
 // TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp

services/net/Android.bp

@@ -57,6 +57,8 @@ java_library {
     visibility: [
         "//frameworks/opt/net/wifi/service",
         "//frameworks/opt/net/wifi/tests/wifitests",
+        "//packages/modules/Wifi/service",
+        "//packages/modules/Wifi/service/tests/wifitests",
     ],
 }