MIUI Style carrier text in the statusbar [1/2]
Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I02264d9cb9ab3e1e1db9e50030092699859c61d4