Revert "Revert "Settings: Inaccurate proximity switch (1/2)""

This reverts commit 0ddc9a09a3c031897eb874775806cbc09b50f8fd.

Conflicts:
	src/com/android/settings/DisplaySettings.java