[automerger skipped] Merge "Clean CHerrypick - Displaying '4G' instead of 'LTE' when the config_show4GForLTE enabled." am: cf396c85fb am: 606bf52967
am: 9e9dfb5b64  -s ours

Change-Id: I689bfcddc55aca95be8ca174c88c42bfeddb1329