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

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

Change-Id: I3b4a3c970a6ff377cb40d71ab3b0d9f64d2c4b1c