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

Change-Id: I4c13d97c2f537035cf3153b5f6d96483abc74bbe