Merge "Move CarrierIdentifier/CarrierService to telephony"
am: 306786abd4

Change-Id: I20c8065c746f4ce025ef45ef4dc6ad0726f83b22