Merge changes from topic "c2_channel_mask" into tm-dev am: 03ad8074 am: 68b43159 am: fc21771d

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



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