Merge "CS: Fix null pointer dereference when stop_distance_measurement" into...

Merge "CS: Fix null pointer dereference when stop_distance_measurement" into main am: b62445cd am: 17b093fc

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



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