ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/os/IPowerManager.aidl
	services/java/com/android/server/power/PowerManagerService.java
Merge branch 'overscroll' of https://github.com/GzRoms-Redux/android_frameworks_base into overscroll