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

Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6