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

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

Change-Id: Iefc3d45c6e370809d3d489b632a48553a04c0919