[automerger skipped] Merge "audio: Add more legacy channel masks for the input...

[automerger skipped] Merge "audio: Add more legacy channel masks for the input direction" into udc-qpr-dev am: 70d36a04 -s ours

am skip reason: Merged-In Ic69b94f6ec650e0814f0200dbef219567eac9fe2 with SHA-1 310b1c6e is already in history

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



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