am ef40a7cc: am 8c09b8c8: am e3991bb8: am 2b16bb99: Merge "Fix LocationManagerTest#testExitProximity" * commit 'ef40a7cc': Fix LocationManagerTest#testExitProximity