Merge "Reset lockout using BiometricManager"