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

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



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