Merge "Revert "Revert "Address API feedback for Bluetooth Distance Meas..."" am: b242301a

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



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