Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev

src/com/android/settings/ConfirmLockPassword.java

@@ -267,6 +267,11 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                 handleAttemptLockout(deadline);
             } else {
                 resetState();
+                mErrorTextView.setText("");
+                if (isProfileChallenge()) {
+                    updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
+                            mEffectiveUserId));
+                }
             }
             mCredentialCheckResultTracker.setListener(this);
         }