Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
am: e14d59a656

Change-Id: I2bcf3d52e970190d900005988cc0e562c8ab7b59