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

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



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