Merge "distance measurement failure with private address." into main am: 3f1572a9

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



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