Merge cherrypicks of [19037861] into tm-release.

Change-Id: Icabf431dfa8f538e223b05dec2f02d79d105a04b
diff --git a/Android.bp b/Android.bp
index a494eb4..1ce1365 100644
--- a/Android.bp
+++ b/Android.bp
@@ -205,6 +205,7 @@
         "//apex_available:platform",
         "com.android.art",
         "com.android.art.debug",
+        "com.android.bluetooth",
     ],
     // being part of updatable apexes, this should work on older releases
     min_sdk_version: "apex_inherit",