Disable Immersive Messages [1/2]

Change-Id: I63ca47f9eecf8e3dcfc0b5b0c6cdb70b7c1a0d6c

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java