Merge changes from topics "360RA channel mask", "audio channels" am: b1060eb9f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669510

Change-Id: Ia821a6b7b843569acc9797d1806beed84a615071