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: 13f226b2 am: 37f20006 am: 18bebee9

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



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