[automerger skipped] Merge "Allow bt import of android.media.audio-aconfig"...

[automerger skipped] Merge "Allow bt import of android.media.audio-aconfig" into main am: 5a3b2f74 am: 57c38f29 -s ours

am skip reason: Merged-In Ic584854e2876c316afe6802034014bd7a02e5d54 with SHA-1 44ded69c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3341680



Change-Id: Ie91931b234767d394be0e7696deb18297e09c433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>