Merge change 3420 into donut

* changes:
  LocationManagerService: Remove some unneeded imports.