Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 8db1be84ce am: c5186a312a am: 7e0e8cbf60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754 Change-Id: I9a5df8ebf0a2ef3c09d6b6b193bc617d33acde04
This commit is contained in: