inaccurate proximity support (2/2)

Change-Id: Ie5af6a071484ecc08218c848963e32db0de74ff1

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