Merge \"Show IMEI SV when phone has LTE_ON_CDMA_TRUE\" into nyc-mr1-dev
am: 10327d07fd

Change-Id: Ifc2019449837e668176f7cd757a2c94a01590a7c