Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a
am: 43e86c1ca6

Change-Id: If7acfafd1cb8e52b778cf8fb347e1a0d509d7f62