Merge "Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev am: e14d59a6 am: 591e96c1 -s ours" into oc-mr1-dev-plus-aosp