Snap for 10447354 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-wifi-release

Change-Id: I09af821bd620e8ccad53bc18e793fc92646f5e85
diff --git a/Android.bp b/Android.bp
index d118e70..2b68e36 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,9 +59,11 @@
     edition: "2015",
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
         "com.android.resolv",
         "com.android.virt",
     ],
+    product_available: true,
+    vendor_available: true,
     min_sdk_version: "29",
 }
diff --git a/cargo2android.json b/cargo2android.json
index 2d87bb2..93c8e27 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,7 @@
 {
   "apex-available": [
     "//apex_available:platform",
-    "com.android.bluetooth",
+    "com.android.btservices",
     "com.android.resolv",
     "com.android.virt"
   ],