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