Be sure to shutdown the proximity sensor after display wake

This fixes:
http://review.cyanogenmod.org/#/c/66657/

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab
Fix NPE

Change-Id: I09b4bb313d499f02b247c265b02c812a5b42bce9
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>
NPE with Lockscreen Notification