Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev