Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"