Configurable up to user (LTE or 4G)

Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I6d15835d813933481c16d9853c8a22f92060d112
couple fixes

Change-Id: I19d742f96ebf26c10ac2a481c99ac7bf60dd28d2

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Custom Carrier Label [1/2]

PS 3 : Fix code style
PS 5 : Rebase
PS 6 : Fix derp

Change-Id: I0100d9af03d33ccacc70a960580ce9a7fca6b61c

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java