*) If you turn the screen on whilst the device is still in a pocket the
fp sensor stays disabled even when the device is moved out into the open.
*) This commit ensures that the FP sensor is always reenabled when the
screen is turned on.
Change-Id: If27967a468673f29d9c1a4742cc9dda95adaab59
