[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: f0649357 -s ours am: 2d8513ad -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: I880de8d42ce511952e64a04fe6fb48e0fb92323c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>