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

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

Change-Id: Id14a3e7743b31530a1629a4eb628360fc74ab666