Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: I230be7dd8d657679c2b33c6324f3b525a98d1e2d
Change-Id: I01e0334dd104b9e64c72981dd5e846b9ae5cc0d1

Android.bp

@@ -183,6 +183,10 @@ cc_library_shared {
             enabled: true,
         },
     },
+
+    header_abi_checker: {
+        diff_flags: ["-allow-adding-removing-weak-symbols"],
+    },
 }
 
 cc_library_static {
@@ -204,6 +208,7 @@ cc_library_static {
         "//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",