Merge "Move CarrierIdentifier/CarrierService to telephony"