Merge changes from topics "360RA channel mask", "audio channels" am: 312ec06912 am: 35f8517cb5

Original change: https://android-review.googlesource.com/c/platform/cts/+/1680530

Change-Id: I9048ee00ff6c42e7cff5470e1178f0a22ef8ccd5