Merge "Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev am: e14d59a656 am: 591e96c105  -s ours" into oc-mr1-dev-plus-aosp
am: 2e08d8d0a1  -s ours

Change-Id: I3840483424efed7c64bfba1272628e594d89fd2c