Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781 am: a4915b26f4

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

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

src/com/android/settings/sim/PreferredSimDialogFragment.java

@@ -91,6 +91,7 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements
         if (dialog == null) {
             Log.d(TAG, "Dialog is null.");
             dismiss();
+            return;
         }
 
         final SubscriptionInfo info = getPreferredSubscription();