am 5b6069ce: Merge "Wrong parameter in LocationManagerService"

* commit '5b6069ce3a87d30960e9ef5870299db90090776b':
  Wrong parameter in LocationManagerService