Configurable LTE icon into 4G instead

Conflicts:
	res/values/strings.xml

Change-Id: I456f8d38acf3273a7ca70aa07d7c3155dcd1af53

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SettingsPreferenceFragment.java
	src/com/android/settings/WirelessSettings.java