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

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

Change-Id: I041d8268de538b7c18c6284c5c3cbdbd61bdbe24