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

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



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