Merge "Only create ScanResultMatchInfo cache entry for saved network"