Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev