Merge "audio: Restrict reported channel masks to "mono" and "stereo"" into main am: 96c01234

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3183105



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