diff --git a/android/app/Android.bp b/android/app/Android.bp
index 28b5acb1f492a81e6444f5a5bcd95e9a2cbb94a4..2e71dccc464fbf4186ac9ae2ef3f8a9ea30e7b9a 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -108,7 +108,7 @@ android_app {
     static_libs: [
         "android.hardware.radio-V1.0-java",
         "androidx.core_core",
-        "androidx.legacy_legacy-support-v4",
+        "androidx.media_media",
         "androidx.lifecycle_lifecycle-livedata",
         "androidx.room_room-runtime",
         "androidx.annotation_annotation",
diff --git a/android/app/tests/unit/Android.bp b/android/app/tests/unit/Android.bp
index 5e946f89072f306aef12415904097cb32c0e0bb5..196b7a4c7c4aa3ee9e8a2bee4e9e3122e83d272d 100755
--- a/android/app/tests/unit/Android.bp
+++ b/android/app/tests/unit/Android.bp
@@ -18,6 +18,7 @@ java_defaults {
     ],
 
     static_libs: [
+        "androidx.media_media",
         "androidx.test.ext.truth",
         "androidx.test.rules",
         "mockito-target",
diff --git a/android/app/tests/unit/AndroidTest.xml b/android/app/tests/unit/AndroidTest.xml
index bc10565587a22fde3b564af86d6ff15b1e7bf1c3..051e15418cc03d73a2c9d0137ef5f7a5ab8f1761 100644
--- a/android/app/tests/unit/AndroidTest.xml
+++ b/android/app/tests/unit/AndroidTest.xml
@@ -30,6 +30,10 @@
         <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />
         <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />
         <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />
+        <option name="run-command"
+                value="setprop bluetooth.profile.avrcp.controller.enabled true" />
+        <option name="run-command" value="setprop bluetooth.profile.a2dp.sink.enabled true" />
+        <option name="run-command" value="setprop bluetooth.profile.sap.server.enabled true" />
         <option name="teardown-command" value="cmd bluetooth_manager enable" />
         <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />
         <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />
@@ -37,6 +41,11 @@
                 value="setprop bluetooth.profile.pbap.client.enabled false" />
         <option name="teardown-command"
                 value="setprop bluetooth.profile.map.client.enabled false" />
+        <option name="teardown-command"
+                value="setprop bluetooth.profile.avrcp.controller.enabled false" />
+        <option name="teardown-command" value="setprop bluetooth.profile.a2dp.sink.enabled false" />
+        <option name="teardown-command"
+                value="setprop bluetooth.profile.sap.server.enabled false" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.FolderSaver">
         <option name="device-path" value="/data/vendor/ssrdump" />
diff --git a/android/app/tests/unit/GoogleAndroidTest.xml b/android/app/tests/unit/GoogleAndroidTest.xml
index 33307d84e7b88dcc1e79ba07919e8c1cd2e5c698..20e66df97ade294be152c9b7817a9a5dee335f27 100644
--- a/android/app/tests/unit/GoogleAndroidTest.xml
+++ b/android/app/tests/unit/GoogleAndroidTest.xml
@@ -30,12 +30,22 @@
         <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />
         <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />
         <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />
+        <option name="run-command"
+                value="setprop bluetooth.profile.avrcp.controller.enabled true" />
+        <option name="run-command" value="setprop bluetooth.profile.a2dp.sink.enabled true" />
+        <option name="run-command" value="setprop bluetooth.profile.sap.server.enabled true" />
         <option name="teardown-command" value="cmd bluetooth_manager enable" />
         <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />
         <option name="teardown-command"
                 value="setprop bluetooth.profile.pbap.client.enabled false" />
         <option name="teardown-command"
                 value="setprop bluetooth.profile.map.client.enabled false" />
+        <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />
+        <option name="teardown-command"
+                value="setprop bluetooth.profile.avrcp.controller.enabled false" />
+        <option name="teardown-command" value="setprop bluetooth.profile.a2dp.sink.enabled false" />
+        <option name="teardown-command"
+                value="setprop bluetooth.profile.sap.server.enabled false" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.FolderSaver">
         <option name="device-path" value="/data/vendor/ssrdump" />