Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660
am: 2d20cd2378

Change-Id: I5a5fd9f900bb1d7217364812d9d0e5477179bfc9