Merge "mainline: remove CarrierConfigManager.init"

src/com/android/settings/network/telephony/ApnPreferenceController.java

@@ -52,7 +52,7 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i
 
     public ApnPreferenceController(Context context, String key) {
         super(context, key);
-        mCarrierConfigManager = new CarrierConfigManager(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
         mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));
     }
 

src/com/android/settings/network/telephony/CarrierPreferenceController.java

@@ -38,7 +38,7 @@ public class CarrierPreferenceController extends TelephonyBasePreferenceControll
 
     public CarrierPreferenceController(Context context, String key) {
         super(context, key);
-        mCarrierConfigManager = new CarrierConfigManager(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
     }
 
     public void init(int subId) {

src/com/android/settings/network/telephony/RoamingDialogFragment.java

@@ -54,7 +54,7 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements
         super.onAttach(context);
         final Bundle args = getArguments();
         mSubId = args.getInt(SUB_ID_KEY);
-        mCarrierConfigManager = new CarrierConfigManager(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
     }
 
     @Override