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

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



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