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

Merge "Fix multiple OOB bugs in btm_ble_gap.cc" into tm-dev am: b7c4b272 am: 84b3691f am: bf3f95e3 am: 07eee94f

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



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