Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 8db1be84ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I3888c00f77ea9143689ae8593d4911af328e8878