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