Merge change I9ff67a5f

* changes:
  LocationManagerService: Fix race when removing LocationListener