Return: Custom Carrier Label [1/2]

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

Change-Id: Ic865e3c5204ab05f1e9ab0e081a54b155b577086

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