am b8155068: Merge change 25944 into eclair

Merge commit 'b8155068ef855147d86465817be2660a5212a6bb' into eclair-plus-aosp

* commit 'b8155068ef855147d86465817be2660a5212a6bb':
  Wake the screen if the proximity wakelock is released while the proximity sensor is active.