Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451

Change-Id: Ic340037c566debd7c5b6275920b361b74e87e7f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -853,14 +853,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();