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

Change-Id: I006d7b3103ebb1bf39ab63a01ecab7c495a8cf7a