Revert "Settings ChooseLockscreen* dismiss in background."

This reverts commit 302aa72446.

Reason for revert: b/308468754

Change-Id: I27ab7e374324b99e7a039b06ad698c214d97592a

src/com/android/settings/password/ChooseLockGeneric.java

@@ -200,14 +200,6 @@ public class ChooseLockGeneric extends SettingsActivity {
             return SettingsEnums.CHOOSE_LOCK_GENERIC;
         }
 
-        @Override
-        public void onPause() {
-            super.onPause();
-            if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
-                finish();
-            }
-        }
-
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);

src/com/android/settings/password/ChooseLockPassword.java

@@ -219,13 +219,6 @@ public class ChooseLockPassword extends SettingsActivity {
         findViewById(R.id.content_parent).setFitsSystemWindows(false);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     }
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (!isChangingConfigurations()) {
-            finish();
-        }
-    }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
             implements OnEditorActionListener, TextWatcher, SaveAndFinishWorker.Listener {

src/com/android/settings/password/ChooseLockPattern.java

@@ -98,14 +98,6 @@ public class ChooseLockPattern extends SettingsActivity {
         return modIntent;
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (!isChangingConfigurations()) {
-            finish();
-        }
-    }
-
     public static class IntentBuilder {
         private final Intent mIntent;