[automerger skipped] Merge "Fix multiple OOB bugs in btm_ble_gap.cc" into...

[automerger skipped] Merge "Fix multiple OOB bugs in btm_ble_gap.cc" into tm-dev am: b7c4b272 am: 25f3fc07 am: 846c895e -s ours am: 59e24d01 -s ours

am skip reason: Merged-In I4c8ec50c15e2727839a49da0e582164557bcd38a with SHA-1 3bb913ee is already in history

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



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