Merge "IMS: Use the slot based ImsManager factory reset API."

src/com/android/settings/ResetNetworkConfirm.java

@@ -105,7 +105,8 @@ public class ResetNetworkConfirm extends OptionsMenuFragment {
                 }
             }
 
-            ImsManager.factoryReset(context);
+            ImsManager.getInstance(context,
+                     SubscriptionManager.getPhoneId(mSubId)).factoryReset();
             restoreDefaultApn(context);
 
             Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)