Merge changes from topic "am-931eac5fdc1f4b699aa5e30cca706273" into main

* changes:
  [automerger skipped] Merge "Merge "AAudio: Support front wide channels" into android13-tests-dev am: 1caa1e267a" into android14-tests-dev am: 38316ecccb -s ours
  [automerger skipped] Merge "AAudio: Support front wide channels" into android13-tests-dev am: 1caa1e267a am: f2e1324a04 -s ours