Custom carrier text [1/2]

Change-Id: Ib2869c8464dc2fc52ae662d63225d8973cdd05cf

Conflicts:

	core/java/android/provider/Settings.java