Merge changes Ia4825f54,If6f80560 into eclair

* changes:
  Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
  PowerManagerService: Hold a wakelock while mProximityTask is queued