Merge "DO NOT MERGE: Patch LocationManagerTest to reduce flakiness"