Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev

        long deadline = getLong(LOCKOUT_ATTEMPT_DEADLINE, 0L, userId);

        final long timeoutMs = getLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0L, userId);

        final long now = SystemClock.elapsedRealtime();

        if (deadline < now) {

        if (deadline < now && deadline != 0) {

            // timeout expired

            setLong(LOCKOUT_ATTEMPT_DEADLINE, 0, userId);

            setLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0, userId);