Be sure to shutdown the proximity sensor after display wake

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

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab
(cherry picked from commit b6ced928d02b6217f142e625078fa30d6e6b849c)