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

Change-Id: I229c015a1f5fc0b04c62150462d90389a3bc9cc9