Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev