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

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

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