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

[automerger skipped] Merge "AAudio: Support front wide channels" into android13-tests-dev am: 1caa1e26 am: f2e1324a -s ours

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

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



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