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

Change-Id: Idc591385a9b5af1fc9004a54388e376d05b1aa15