Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de" into stage-aosp-master am: e4409e6b am: 87b9f9f4 am: 76d355e5

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

Change-Id: I90a8b50c1b8da8792b75a3b0f0c5c85ce044d488