Merge "Added unit tests for Passpoint/Osu integration in WifiTracker"