[automerger skipped] Merge "Prevents the OOB data generation procedure from...

[automerger skipped] Merge "Prevents the OOB data generation procedure from getting stuck because the SMP state machine is busy" into tm-qpr-dev am: 07a33cee am: 788d4da8 -s ours

am skip reason: Merged-In If70c930e1586d03f5125dcfb3897c37f9eb2c87f with SHA-1 4319fc82 is already in history

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



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