am 7cb8ed2: Merge change 414 into donut

Merge commit '7cb8ed23ab81b7cffdff6fc1cad473f55732ea66'

* commit '7cb8ed23ab81b7cffdff6fc1cad473f55732ea66':
  location: Run LocationManagerService in a separate thread.