Snap for 8512216 from dde8b4d79d94ba1347830a1d2dc4574ce1832b50 to tm-frc-conscrypt-releaset_frc_con_330443020android13-frc-conscrypt-release

Change-Id: I2033dc535f3abb9af046b1fc78fddee0bbc96ee5

2 files changed, 1 insertions, 2 deletions

diff --git a/METADATA b/METADATA
index 27ae89a..c653c6a 100644
--- a/METADATA
+++ b/METADATA
@@ -2,6 +2,6 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
-  # would be NOTICE save for the proprietary directory
+  license_note: "would be NOTICE save for the proprietary directory"
   license_type: BY_EXCEPTION_ONLY
 }
diff --git a/device.mk b/device.mk
index a166538..9d4ba1b 100644
--- a/device.mk
+++ b/device.mk
@@ -50,7 +50,6 @@ PRODUCT_PACKAGES += \
     android.hardware.audio@4.0-service \
     android.hardware.audio.effect@4.0-impl \
     android.hardware.soundtrigger@4.0-impl \
-    audio.a2dp.default \
     audio.usb.default \
     audio.r_submix.default \
     audio.primary.poplar