Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev