Revert "Frameworks: Inaccurate proximity switch (2/2)"

This reverts commit e6f397af4d8490d15997bddd3cd57eec0549c979.

Conflicts:
	core/java/android/provider/Settings.java