Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev