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

Change-Id: Ifaa8027439327c8c71afa9dc23d38946ceebc86c