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

Change-Id: If8dcd06b40f13df35a2871151187fc63c8a4cecc