ProximityWake: Fix and bring inline with CM

Conflicts:
	core/java/android/os/IPowerManager.aidl

Change-Id: Ib35b83b2558e7516d8e80254b6e649149f270831
Merge "ProximityWake: Fix and bring inline with CM" into kitkat3