[automerger skipped] Merge "Avoid invalid state in search/discovery queue...

[automerger skipped] Merge "Avoid invalid state in search/discovery queue state machine" am: 0cf0e68a am: 387be9e8 -s ours am: e0c5935f -s ours am: c3ed0816 -s ours

am skip reason: Merged-In I74e83964995b10f4bee35bae3182ec482bdedb39 with SHA-1 d197ce9a is already in history

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



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