[automerger skipped] Merge "[Telephony] Show 4G icon instead of 3G icon for...

[automerger skipped] Merge "[Telephony] Show 4G icon instead of 3G icon for UMTS network in ATT" am: 00de08f4 am: af61adbd -s ours am: 9b45c8d1 -s ours am: 1aed968a -s ours am: f83b45f0 -s ours

am skip reason: Change-Id Idc3f0f645a3c2c653061e6dac546f3469b2bc757 with SHA-1 3f46bb84 is in history

Change-Id: I3859caac7f8b0157d8af9777a48676be3041d2b2