[automerger skipped] Merge "AAudio: Support front wide channels" into...

[automerger skipped] Merge "AAudio: Support front wide channels" into android13-tests-dev am: 1caa1e26 am: 7fbe6f03 am: 5532e4d0 am: 59858797 -s ours am: ef7b3ce9 -s ours

am skip reason: Merged-In I6f88b74ee5f50b86088c6e1c4cca374cfe85e444 with SHA-1 db4ea93d is already in history

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



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