Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6 am: 15ca33865c

am: aca1e304bd

Change-Id: I0b3b6198e895caf4c33354ffb2fc20b599540387

src/com/android/settings/ResetNetworkConfirm.java

@@ -150,7 +150,8 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
                 }
             }
 
-            ImsManager.factoryReset(context);
+            ImsManager.getInstance(context,
+                     SubscriptionManager.getPhoneId(mSubId)).factoryReset();
             restoreDefaultApn(context);
             esimFactoryReset(context, context.getPackageName());
             // There has been issues when Sms raw table somehow stores orphan