Merge "Fix failing WifiNetworkScoreCacheTest."