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