Merge "[automerger skipped] Merge "A2DP: Enable AAC VBR Offloading" into...

Merge "[automerger skipped] Merge "A2DP: Enable AAC VBR Offloading" into rvc-d1-dev am: a836c08f am: f6b3d0eb -s ours" into rvc-qpr-dev-plus-aosp am: f7b5e45b -s ours

am skip reason: Change-Id I55df55bbad18ab561493ec9d4d930345056d8c72 with SHA-1 0505ab43 is in history

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

Change-Id: I5d6f783ee0ca273c286a5336ed70ad389a8a9e11