Snap for 8730993 from d0bc3d1bbc83b7138a3d2e533f352d980db3dc64 to mainline-tzdata3-release

Change-Id: I04e42441f417848db289f3bd50d0027060f6c1e0
diff --git a/Android.bp b/Android.bp
index 3c03e6c..d86573e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,20 +53,6 @@
 }
 
 java_library {
-    name: "grpc-java-lite",
-    static_libs: [
-        "grpc-java-context",
-        "grpc-java-core",
-        "grpc-java-core-inprocess",
-        "grpc-java-core-internal",
-        "grpc-java-core-util",
-        "grpc-java-protobuf-lite",
-        "grpc-java-stub",
-    ],
-    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
-}
-
-java_library {
     name: "grpc-java-okhttp-client-lite",
     host_supported: true,
     static_libs: [
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index e4563a1..1902402 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -34,11 +34,3 @@
         "grpc-netty-shaded-1.16.1-jar",
     ],
 }
-
-java_library {
-    name: "grpc-java-netty-shaded-test",
-    static_libs: [
-        "grpc-netty-shaded-1.16.1-jar",
-    ],
-    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
-}