Merge "Revert "Address API feedback for Bluetooth Distance Measurement"" am: e46a9fe5

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



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