[automerger skipped] Merge "Store and report the union of SDP and BLE UUIDs."...

[automerger skipped] Merge "Store and report the union of SDP and BLE UUIDs." am: 9285462c -s ours am: 6bc3237c -s ours am: d3552965 -s ours am: 0fafa72a -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: Ic20aaa7b57cf829c3ac6b1c238ceb9d7bab7abff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>