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

Change-Id: If83d2ec7d3ddf8066857cf38597ab884979196a6