ProximityWake : Squash and port from CyanogenMod

1) ProximityWake: Add support for checking proximity when waking device
2) Framework : Fix proximity wakeup reference
3) Be sure to shutdown the proximity sensor after display wake

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java