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

Change-Id: I08fe2e52a4926dc3d2fae02bf90c3fcf5b60ee82