[automerger skipped] Clean Cherrypick - Displaying '4G' instead of 'LTE' when the config_show4GForLTE enabled. am: fa3961b43b -s ours
am: 95c7f481b8 -s ours
am skip reason: change_id I5ff3a0aa452e32a1de508cb078c3b6eb16a66075 with SHA1 f6d02cc449 is in history

Change-Id: If9c8285bbc97cec90cc5e09745db6fbf5be1b45c