[automerger skipped] Merge "Use Common Audio Service UUID from latest assigned numbers" am: c090ca4c am: 3003b891 am: f749c6a8 am: 3db8180a -s ours

am skip reason: Merged-In Ia165311694eb7bc9881497ade923c15ae603f43e with SHA-1 4498f94c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1934964

Change-Id: I0cca721b8d5186ba07e1bb79d01181410d47ef3e