Merge "Deprecate WifiTracker/AccessPoint" into rvc-dev am: 97ea72690f am: 0940c052db am: 0fc09bd6c9

Change-Id: Icc10c5fa297b97feb08c3db2f62166f7a8e2e23d