Merge "Fix multiple OOB bugs in btm_ble_gap.cc" into tm-dev am: b7c4b272

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



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