Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
am: a5a660a84d

Change-Id: Id3804ecaf51b18731d21dc8ff4f592bfcaa3095c