Merge "move column defs to Telephony.CarrierIdentification" am: 8ab184ca94 am: caa53c59b6
am: b92baee305

Change-Id: I5d8dd372d2f7aa31612e05ffca1e082798cc75d4