Revert "Destroy activity in onStop()"

This reverts commit 7a89f15fed.

Reason for revert: Droidfood blocking bug b/278178618
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b215d94d5174caa0ac3a1cdb15fc10733e9e2b90)
Merged-In: Ie26b73e1e9584f632625375d36168a42e95e5f02
Change-Id: Ie26b73e1e9584f632625375d36168a42e95e5f02

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

@@ -815,14 +815,6 @@ public class ChooseLockGeneric extends SettingsActivity {
             return intent;
         }
 
-        @Override
-        public void onStop() {
-            super.onStop();
-            if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
-                getActivity().finish();
-            }
-        }
-
         @Override
         public void onDestroy() {
             super.onDestroy();