Merge "Merge "Store and report the union of SDP and BLE UUIDs." into tm-dev...

Merge "Merge "Store and report the union of SDP and BLE UUIDs." into tm-dev am: e8632e36 am: 5e49b730" into tm-d1-dev-plus-aosp am: 9fb70a3a am: 11e08f39

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



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