Merge "Fix flaky WifiTrackerTest"