Merge "Fix failing WifiNetworkScoreCacheTest."
am: 5e055b6a18

Change-Id: I52e23144730acc15c943fa6485a872a88ee0a787