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

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



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