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

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

Change-Id: I78ba7a3456ff348c518c8d50a6c22f0216b08004