Merge "Pandora: Add service uuids" am: 89aeabb4 am: 0fda0190 am: a0b071ba

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



Change-Id: Ie4ae06c79a0e702a20eb170d2b8c41e399252975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>