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