Merge "Supports back to back concurrent measurement." into main am: 94a145ff am: 4ccd64d5

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



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