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

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

Change-Id: I3a28152420ae7c180cc9e42f03cab1595167db3b