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

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



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