Settings : Add preference for proximity wake

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