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: I3bfab12fb7faf2c00c050d36579f82aa68289d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>