Merge "Add dynamic support for 4G/LTE/LTE+ icons" am: 0c9254ee66
am: 5bd6b4d570

Change-Id: Ib0c30a20063087de7e336d01675f83de0aa64c7d