Merge changes from topic "c2_channel_mask" into tm-dev am: 03ad8074 am:...

Merge changes from topic "c2_channel_mask" into tm-dev am: 03ad8074 am: 5a6593f3 am: 6f0127d1 am: 06b77580

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



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