Merge "Start using CarrierConfig for 4G/LTE icon" am: 198a30f4e8
am: 14594749d7

Change-Id: I2e1155301fbfe8ee8d94f5ad97beb52f73b2aa49