[automerger skipped] Merge "Fix delay which occurs while pairing" into...

[automerger skipped] Merge "Fix delay which occurs while pairing" into tm-qpr-dev am: 3edb7fa0 -s ours

am skip reason: Merged-In I96c121735550923d774d133c950146ebed871387 with SHA-1 d3332e15 is already in history

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



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