Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 307b7d3ac1

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

Change-Id: I39050b26ed6d822e86d8de882ac486f59c5dd82e