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

This reverts commit ae785c8bd392d772332e24727d19a6b97adf1dd1.

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