Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev
am: e644b8cfa3

Change-Id: I003454ea1526b58d5ce52ad18b6a674c0c57dcea