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

Change-Id: I18e7f77e4a58ed8abe288aa04b762d112ae495b2