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

Merge "[automerger skipped] [Telephony] Show 4G icon instead of 3G icon for UMTS network in ATT am: 0435f0ae -s ours am: fc469ec6 -s ours am: 07845329 -s ours" into rvc-d1-dev-plus-aosp am: 8fa063a7 -s ours

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

Change-Id: Icac2054d7c87f6f181283e0433f8fdc6f977a500