Merge "Prevents the OOB data generation procedure from getting stuck because...

Merge "Prevents the OOB data generation procedure from getting stuck because the SMP state machine is busy" am: f18448b9 am: 68610fd7

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



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