Merge "service-uwb -> service-bluetooth" am: e19d1fcc am: f5c9dc24

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



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