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