[automerger skipped] Merge "[Telephony] Show 4G icon instead of 3G icon for UMTS network in ATT" am: 00de08f436 am: af61adbdd5 -s ours am: 9b45c8d1d6 -s ours am: 1aed968a95 -s ours
am skip reason: Change-Id Idc3f0f645a3c2c653061e6dac546f3469b2bc757 with SHA-1 3f46bb846c is in history
Change-Id: Ifaff6086358d5a8c2379174d6ea4fd73c4835b01
This commit is contained in: