Merge "Uses states to manage the measurement conflicting finely." into main am: 25a98f65

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



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