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