Merge change 25012 into eclair

* changes:
  PowerManagerService: Use 5 cm threshold for the proximity sensor.