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