Merge "Start using CarrierConfig for 4G/LTE icon"