Merge "C2: channel mask can be input to encoder" into udc-dev am: 3f90f49f am: 5744d7bc

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



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