am 8c09b8c8: am e3991bb8: am 2b16bb99: Merge "Fix LocationManagerTest#testExitProximity"

* commit '8c09b8c887cf10d71ede6f55d4b391edf1366c22':
  Fix LocationManagerTest#testExitProximity