Merge "Fix delay which occurs while pairing" into tm-qpr-dev am: 3edb7fa0

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



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