Merge change I46ea3489 into eclair

* changes:
  Make sure we wake up the screen if the keyguard is not visible when we think it should be.
tree: ca0501a1aa699b9c414eca8f3154cf855130225a
  1. policy/