Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de" into stage-aosp-master am: 307b7d3a am: 964497aa am: 3e037b91

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

Change-Id: Idb3154b7b1f70985832f84cd4c34c619aed843f5