resolved conflicts for merge of 123fb19d to master

Change-Id: Ie029b8d72eaf968a5224cd0b90d97b112d51ba35

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

@@ -1348,9 +1348,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
      */
     private void handleKeyguardReset() {
         if (DEBUG) Log.d(TAG, "handleKeyguardReset");
-        if (!isUnlockingWithFingerprintAllowed()) {
-            updateFingerprintListeningState();
-        }
+        updateFingerprintListeningState();
     }
 
     /**

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

@@ -1051,6 +1051,7 @@ public class KeyguardViewMediator extends SystemUI {
                 // Without this, settings is not enabled until the lock screen first appears
                 setShowingLocked(false);
                 hideLocked();
+                mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
                 return;
             }
         }