Snap for 8564071 from 09023836cbaffad69a2063eebbb742b4065b680a to mainline-wifi-release

Change-Id: I3f302f8757eb8553efe50e34b6053de5d5ebff8f
diff --git a/Android.bp b/Android.bp
index 0c67186..b5ebb72 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,7 +94,7 @@
 
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth.updatable",
+        "com.android.bluetooth",
         "com.android.media.swcodec",
     ],
     min_sdk_version: "29",
diff --git a/METADATA b/METADATA
index 5c12860..4dab5e4 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "Software License for The Fraunhofer FDK AAC Codec Library for Android"
   license_type: BY_EXCEPTION_ONLY
 }