Merge change 25490 into eclair

* changes:
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."