Merge "Prevents retrying fingerprint after lockout reset if user exits...

Merge "Prevents retrying fingerprint after lockout reset if user exits FingerprintSettings" into tm-qpr-dev am: 5c101882

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21038428



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