Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660 am: 2d20cd2378" into pi-dev-plus-aosp
am: 78f8fb79b5

Change-Id: Ie64e6636de76cb7e92b4bc33451d95437c179350