Merge "Send FINGERPRINT_ERROR_LOCKOUT on some devices" into nyc-dev