Settings: Add proximity wake-up

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
Signed-off-by: anerikg <anerikgames@gmail.com>

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