Merge change 24501 into eclair

* changes:
  Make Phone.updateServiceLocation acquire a one-shot wake lock.