Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e am: fb719ecfc8 am: b7d745a7a0

Change-Id: Ic7aa93898dabf3e2a8e55bf15dafee53ff54a621

src/com/android/settings/IccLockSettings.java

@@ -301,6 +301,9 @@ public class IccLockSettings extends SettingsPreferenceFragment
 
         if (mPinDialog != null) {
             mPinDialog.setEnabled(sir != null);
+            if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                mPinDialog.getDialog().dismiss();
+            }
         }
         if (mPinToggle != null) {
             mPinToggle.setEnabled(sir != null);