Merge "WifiTrackerLibTests - remove dependency on hide API"