ProximityWake: Fix and bring inline with CM

Change-Id: I4361da44fbc0ee46862453d650cd16c440781011