Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 8f43581b46 am: 7542dc70b7 am: d6082e524f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754 Change-Id: If292a6a265000b3fa329c28e7b738c79c3615c85
This commit is contained in: