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

Merge "Store and report the union of SDP and BLE UUIDs." into tm-dev am: e8632e36 am: 5778786c am: 961c7c16 am: 2e7fc3b3

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



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