Custom Carrier Label

Change-Id: I5ada4ef886b7aa9f936012d3510082e2bc349a43

Conflicts:

	core/java/android/provider/Settings.java