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

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

Change-Id: I94aa095ed5ba59acac76a59a46acca90dd383359