Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev

am: 0d0bf428b9

Change-Id: Iac00caccc37e43c79c36532948bc4d0042f222c9

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

@@ -1403,6 +1403,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     }
 
     protected void handleStartedGoingToSleep(int arg1) {
+        mLockIconPressed = false;
         clearBiometricRecognized();
         final int count = mCallbacks.size();
         for (int i = 0; i < count; i++) {
@@ -1438,7 +1439,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     }
 
     private void handleScreenTurnedOff() {
-        mLockIconPressed = false;
         mHardwareFingerprintUnavailableRetryCount = 0;
         mHardwareFaceUnavailableRetryCount = 0;
         final int count = mCallbacks.size();