Snap for 9470583 from 418811cc4c3644ea58ba6cbaddb6a0bd5ab8d0ae to tm-qpr3-release

Change-Id: I08e6867860e718f036be00cad457afd413cd6320
diff --git a/Android.bp b/Android.bp
index 3c03e6c..bb18eba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,7 +63,10 @@
         "grpc-java-protobuf-lite",
         "grpc-java-stub",
     ],
-    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
+    visibility: [
+        "//packages/modules/Bluetooth/pandora/interfaces",
+        "//packages/modules/Bluetooth/android/pandora/server",
+    ],
 }
 
 java_library {
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index e4563a1..3fe93f0 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -40,5 +40,5 @@
     static_libs: [
         "grpc-netty-shaded-1.16.1-jar",
     ],
-    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
+    visibility: ["//packages/modules/Bluetooth/android/pandora/server"],
 }