Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4

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