[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: 84b3691f am: bf3f95e3 -s ours

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

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



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