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: 68b43159 am: fc21771d am: bddf6131

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



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