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

Change-Id: Ia3547be34c7ee129bbfeda4b3d2889f7304b3ac8