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

Change-Id: I28be43cb6aaa232fb7a89dfbd5f8c70998448b17