Merge change 25944 into eclair

* changes:
  Wake the screen if the proximity wakelock is released while the proximity sensor is active.