Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: a111377f7d am: 1156f68082

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

Change-Id: I4e109a18453b6848fb2aa256b2c73ca665aea328