Merge changes from topic "cherrypicker-L17700000962261813:N11400001392188571" into main am: b93626c412

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680665

Change-Id: Ib4cc051e79aede054c04c2423581cb0c84fce702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 40ceb32..148c63c 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -33,6 +33,7 @@
             apex_available: [
                 "//apex_available:platform",
                 "com.android.btservices",
+                "com.android.media.swcodec",
             ],
             min_sdk_version: "29",
         },