Merge "Set pending client to null after timeout resumes"

            FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED,

                    statsModality(), BiometricsProtoEnums.ISSUE_CANCEL_TIMED_OUT);

            ClientMonitor newClient = mPendingClient;

            mCurrentClient = null;

            startClient(mPendingClient, false);

            mPendingClient = null;

            startClient(newClient, false);

        }

    }