Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 1feaa9f621 am: ecf29aa930

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

Change-Id: Ia86e85d158b375f56eeb55581abc4a6438cbe033