Keep task stack when invoking settings from setup wizard

Bug: 8336068
Change-Id: If1df32595f72285b2dad16e28b4429b7b6059839

java/src/com/android/inputmethod/latin/setup/SetupActivity.java

@@ -236,8 +236,7 @@ public final class SetupActivity extends Activity implements View.OnClickListene
         final Intent intent = new Intent();
         intent.setClass(this, SettingsActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
-                | Intent.FLAG_ACTIVITY_CLEAR_TOP
-                | Intent.FLAG_ACTIVITY_NO_HISTORY);
+                | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
     }