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: 4140458c am: 2e5295f9

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



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