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

Change-Id: I64e67c6aeb6432440a9f1aeb10640975a61041ee