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

* commit 'e3991bb8ff9e69d964b97f2689b7978a43e41510':
  Fix LocationManagerTest#testExitProximity