Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de" into stage-aosp-master am: a111377f am: 1156f680 am: 25b9380d

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

Change-Id: Ife5fec01970e9e10a8284734c3bab08da5b3c1ef