ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

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

Conflicts:
	core/java/android/os/IPowerManager.aidl
Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_frameworks_base-1 into cm-11.0
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_frameworks_base-1 into cm-11.0

Conflicts:
	services/java/com/android/server/power/PowerManagerService.java
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_frameworks_base-1 into cm-11.0
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_frameworks_base-1 into cm-11.0