Merge "Use Common Audio Service UUID from latest assigned numbers" am: ccb536b8e2

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

Change-Id: I00dabdc935aa395ca0cba1fa07fcd66735dc8e1c