Merge "Revert "Fix the recovery flow if a timeout occurs"" into main am: 7bc0432669

Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/2795700

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