Merge "Filter out interfering wifi scans in testWifiScanLogsScanAtoms" into tm-dev