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

Change-Id: Ie5841b4e86231517f724948389ff2b819d8245ad