[automerger skipped] Merge "Use Common Audio Service UUID from latest assigned...

[automerger skipped] Merge "Use Common Audio Service UUID from latest assigned numbers" am: ccb536b8 am: cc65d334 am: 65bed708 am: d5b640e3 -s ours

am skip reason: Merged-In I35684ecec50c3db757331b6384c2579f5a28a70a with SHA-1 b5ff8bcd is already in history

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

Change-Id: I91ed9c5d78dba43f1b484946a3c3a9d59152ed4c