Merge "Add more legacy channel masks for the input direction" am: cb4d52e60d am: dd0e6623f7 am: 0e29cb9301 am: a0cd8544f8 am: 02d206c7ac

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

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