Configurable up to user (LTE or 4G)

Conflicts:
	core/java/android/provider/Settings.java
Merge branch 'cm-10.2' of github.com:torrented/android_frameworks_base into cm-10.2