Settings: Add proximity wake-up toggle

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

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Settings: add back some hardware tunables

Change-Id: If55ba3a5f45614cfdf0087e2c57205461a5bbdc6