[automerger skipped] Merge "frameworks/av: Fix audio Android.bp files" into...

[automerger skipped] Merge "frameworks/av: Fix audio Android.bp files" into main am: b2eedcbc am: b2f56ef4 -s ours

am skip reason: Merged-In I7afcaa71d6ec1b71cec4a148d226c92660ec945c with SHA-1 a159e4b9 is already in history

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



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