Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de" into stage-aosp-master am: 8f43581b am: 7542dc70

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

Change-Id: I2b816053f325a2d294b5ce8f9f41f92b2447f331