[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 skip reason: Change-Id Idc3f0f645a3c2c653061e6dac546f3469b2bc757 with SHA-1 3f46bb846c is in history
Change-Id: I8ad2850730324b7ea4416d820cc345be56543e20
This commit is contained in: