Merge change 21510 into eclair

* changes:
  LocationManagerService: Add NullPointerException to avoid change in behavior.