Merge "Move configs to CarrierConfig for MobileNetworkSettings"
am: a9ca5c9999

Change-Id: I0706c8456290ef235747ac908b6a8231a70131dc