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

am: 15ca33865c

Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899

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