Merge "Reset password field instead of keyguard" into pi-dev

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

@@ -241,6 +241,10 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback {
         mViewMediatorCallback.resetKeyguard();
     }
 
+    public void resetSecurityContainer() {
+        mSecurityContainer.reset();
+    }
+
     @Override
     public void onSecurityModeChanged(SecurityMode securityMode, boolean needsInput) {
         if (mViewMediatorCallback != null) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

@@ -76,7 +76,7 @@ public class KeyguardBouncer {
     protected KeyguardHostView mKeyguardView;
     private final Runnable mResetRunnable = ()-> {
         if (mKeyguardView != null) {
-            mKeyguardView.reset();
+            mKeyguardView.resetSecurityContainer();
         }
     };