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" into tm-qpr-dev am: 07a33cee

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



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