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

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

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