am 2b16bb99: Merge "Fix LocationManagerTest#testExitProximity"

* commit '2b16bb99a0261000f0558b5e18c4335fe19d478d':
  Fix LocationManagerTest#testExitProximity