[automerger skipped] Merge "Make SDP and inquiry request dequeue and execute more comprehensive and cancelDiscovery now removes all queued inquiry requests." into sc-qpr1-dev am: e2787715 am: bc130cc5 -s ours

am skip reason: Merged-In I7b9fc60f090e507c9905ed98c8d2c82d0a9a1fd2 with SHA-1 b4c0e78a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15889265

Change-Id: I79b4f399501117af21fecf8db6c07e2a1bb94538