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

Change-Id: Ibf8b3f0c986acb156c3705ee569554bf673269f0