Revert "Return: Custom Carrier Label [1/2]"

This reverts commit 9c7d9b58ff6392331e169323072d97dda90993aa.

Conflicts:

	core/java/android/provider/Settings.java