Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de" into stage-aosp-master am: 3036d7bf am: b56a9f0a

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

Change-Id: Ia710384e28ecf8d3bd01cdaf3953e77497c974cc