Configurable LTE icon into 4G instead

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SettingsPreferenceFragment.java
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2