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

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

Change-Id: I66b64d7101365185add4dbffefa4df95a787eaae