Merge "Disable fingerprint after user lockout" into mnc-dr-dev