Merge change 22958 into eclair

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