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

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

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



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