Custom carrier label (1/2)

Change-Id: If46ba831720797a7090d2a6227bb3f1146b49877
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

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

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