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