This reverts commit 140516bf.
Reason for revert: Bug where users cannot use biometrics to re-auth after trustagent timeout.
Bug: 251078638
Change-Id: I6254196327e09381eaa047e6444034ada6030113
(cherry picked from commit f60d171a)
Merged-In: I6254196327e09381eaa047e6444034ada6030113