Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e4409e6b7e am: 87b9f9f432 am: 76d355e5a2 am: 91b768452f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754 Change-Id: Ib49c52fe6c504a9a17d3b05a05d4fd92e2adaa5e
This commit is contained in: