Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de" into stage-aosp-master am: d28e890b am: a5b03559

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

Change-Id: If15c54277193abed787d72ab4f44211ab698c86c