Merge "Fix WifiTrackerTest stopTrackingShouldRemove . . ."