Merge b220c865e41f468c6e5d43bb4725ddfe6dc483b8 on remote branch

Change-Id: Iae1d881ed7ddad0b8e63133da7162cb3c75b454b
diff --git a/Android.bp b/Android.bp
index 3c03e6c..5a37d37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,7 +63,7 @@
         "grpc-java-protobuf-lite",
         "grpc-java-stub",
     ],
-    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
+    visibility: ["//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"],
 }