Merge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult...
Merge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe6" into stage-aosp-master am: 78d17025" into pi-dev-plus-aosp
am: da912fb4
Change-Id: Ic2288afe4b4b077cba263e51f6308c34332b5eb1