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

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

Change-Id: I0506c9e459375728796709f48c14156da425b860