Custom Carrier Label [2/2]

Change-Id: I108f4761ee3246a2b0187277b40702b5262e8f1f

Conflicts:
	res/values/probam_strings.xml