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

Change-Id: I0650d2e97ffc26f64da8a0118ed2b3133ae39030