[automerger skipped] Merge "Queue discovery and device inquiry while bonding"...

[automerger skipped] Merge "Queue discovery and device inquiry while bonding" into sc-dev am: eacffb5b -s ours

am skip reason: Merged-In I260c967de0f4656ee852a098a98c9ceb0e6dfbde with SHA-1 d7762e71 is already in history

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

Change-Id: Ied3215914f6070772c0f6c7127d1eadbfb8e1abe