Custom carrier text [2/2]

Change-Id: I328b8eb9781fd0f4424bf53f8e5d0b7e82f0ad0a

Conflicts:
	res/values/cm_strings.xml