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

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



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