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

Change-Id: I9391511c34f41101612bc02ca6271db5d2a35238