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

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



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