am 9d9953d9: Merge change 3420 into donut

Merge commit '9d9953d94de4d17722ba2c768b92bd4ebeec908c'

* commit '9d9953d94de4d17722ba2c768b92bd4ebeec908c':
  LocationManagerService: Remove some unneeded imports.