Merge "CarrierConfigManager changes for DataConfigManager"