Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: a111377f7d am: 1156f68082 am: 25b9380d79 am: eecc1fb9a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754 Change-Id: Iaad61c3524a3629b554ddf31dea258b208522fe2
This commit is contained in: