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