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

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

am skip reason: Merged-In I05bc2a5f668eb970c647912ced25a4c87765440e with SHA-1 4b11bd63 is already in history

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



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