am c58c13d1: (-s ours) am 413fcaa2: Probable fix for LocationManagerTest on devices w/o GPS

* commit 'c58c13d1b4397559eb0128183d6ad450e40c248f':
  Probable fix for LocationManagerTest on devices w/o GPS