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

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



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