Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev

        // Don't hide the keyguard due to a doze change if there's a lock pending, because we're

        // just going to show it again.

        if (mShowing || !mPendingLock) {

        // If the device is not capable of controlling the screen off animation, SysUI needs to

        // update lock screen state in ATMS here, otherwise ATMS tries to resume activities when

        // enabling doze state.

        if (mShowing || !mPendingLock || !mDozeParameters.canControlUnlockedScreenOff()) {

            setShowingLocked(mShowing);

        }

    }