Merge "Fix crash from dismissing after pause" into nyc-mr1-dev

src/com/android/settings/SettingsPreferenceFragment.java

@@ -520,7 +520,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
         // To be able to dismiss dialog at that time, don't check
         // mDialogFragment.isVisible().
         if (mDialogFragment != null && mDialogFragment.getDialogId() == dialogId) {
-            mDialogFragment.dismiss();
+            mDialogFragment.dismissAllowingStateLoss();
         }
         mDialogFragment = null;
     }