Merge "Optimize and clean up...

Merge "Optimize and clean up DistanceMeasurement(Manager,NativeInterface,Tracker)" into main am: 8c58724d am: e8d4dbf9

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



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