[automerger skipped] Store and report the union of SDP and BLE UUIDs. am:...

[automerger skipped] Store and report the union of SDP and BLE UUIDs. am: 8859f372 -s ours am: af92aa3c -s ours am: 86b7053f -s ours am: e6c793a7 -s ours

am skip reason: Merged-In I0c12296441e9c61ea766a969e6294ea192d9a1c4 with SHA-1 f0a68745 is already in history

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



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