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