Revert change that would detectFp when FP is locked out This reverts commit ff09044d12f936bab51ed9e7d33016616ce9e87e in addition to partially reverting ag/20141372. Reason for revert: b/245778799 Change-Id: Iea66d7782b3365dea827b854783aeddaa5c6699c (cherry picked from commit 7fd68c74a7fd46c9f460593aa54d03c1d60016fb) Merged-In: Iea66d7782b3365dea827b854783aeddaa5c6699c