Frameworks: Inaccurate proximity switch (2/2)

Change-Id: I890cc81e548f63c9bd75eaa7e309d15836d13944

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