Revert: Custom carrier label

PS2: Rebase

Change-Id: I07a30fe0ae68690438b548a6226eba6f5286a33e
Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java (reverted from commit e672c7541d8a7a8c2c6f2cc25dc40a6e3f48c48e)