Merge "Clean CHerrypick - Displaying '4G' instead of 'LTE' when the config_show4GForLTE enabled."
am: cf396c85fb

Change-Id: I761f8c037ab930b8f534cd7cc792e4de722c3f33