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

[automerger skipped] Merge "Use Common Audio Service UUID from latest assigned numbers" am: 0268bbd3 am: f8ac8889 am: c98ecf5d am: 94697619 -s ours

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

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

Change-Id: I91ed9c5d78dba43f1b484946a3c3a9d59152ed4c