Revert "Framework : Fix proximity wakeup reference"

This reverts commit 771b3589caa47feb359af1a4de290b7de8129e22.
Revert "ProximityWake : Add support for checking proximity when waking device"

This reverts commit c9a7310f69661e15b1d2b09421c23c5dd0f7abf5.

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