Settings: Add proximity wake-up toggle

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into AOSPA-kitkat

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

	modified:   res/values/pa_strings.xml
	modified:   res/xml/display_settings.xml
	modified:   src/com/android/settings/DisplaySettings.java
Merge branch 'AOSPA-kitkat' into kitkat