Merge change 25519 into eclair

* changes:
  LocationManagerService: Take fix accuracy into account in proximity zone logic.