Snap for 9550733 from 4e6f332ae08065111779ca948ba959dc8111d891 to mainline-tzdata5-release

Change-Id: I58b86a0403f013dd897b9c914e66ea3ead8b1910
diff --git a/Android.bp b/Android.bp
index 399a8c0..861f503 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,7 +61,7 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
     ],
     min_sdk_version: "29",
 }
@@ -75,7 +75,7 @@
     shared_libs: ["libgrpc++"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
     ],
     min_sdk_version: "29",
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index d97431f..38f7cca 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -66,7 +66,7 @@
 -    shared_libs: ["libstdc++"],
      apex_available: [
          "//apex_available:platform",
-         "com.android.bluetooth",
+         "com.android.btservices",
      ],
      min_sdk_version: "29",
  }
@@ -80,7 +80,7 @@
 +    shared_libs: ["libgrpc++"],
 +    apex_available: [
 +        "//apex_available:platform",
-+        "com.android.bluetooth",
++        "com.android.btservices",
 +    ],
 +    min_sdk_version: "29",
 +}