Merge "Uses states to manage the measurement conflicting finely." into main...

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

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



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