Merge "Avoid invalid state in search/discovery queue state machine" into...

Merge "Avoid invalid state in search/discovery queue state machine" into tm-dev am: 97908968 am: cc2b77a4 am: 76ceb001 am: ca679d0d

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



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