[automerger skipped] Fix delay which occurs while pairing am: f2a72185 -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: I3e47562a188259660e4d2f56df0b2e33c4d2da9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>