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

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

Change-Id: I805b3c2f64d8430191a23e7ae622c37d8628f042