Fix lock screen notifications proximity sensors

Fixes pocket mode and wake on notification options

Thanks Steve Spencer :)

Change-Id: I3e7ee05be12c86ce31c2db4d8150c0f5b3c3dadc

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationViewManager.java