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

Change-Id: Ia1ce5ee294b75f5169926492749e31e8a62825a7