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

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

Change-Id: I2fbce01d6817edb9ea41284f38fe2fa09d5eea79