Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e71830dafc am: 645e8be668 am: afc5cd5ff5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754 Change-Id: Id77128af5211b0a690b0dfc318a7463359965a5e
This commit is contained in: