Merge "Make SDP and inquiry request dequeue and execute more comprehensive and...

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

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

Change-Id: Ib968d93a142e069c376a089143998e3ccd735833