Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: f58b846016 am: af91071bfb am: c6dab41b5f am: 454b0094cb

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

Change-Id: I297e798f6365d883121e35faef29c03a2e00523b