Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660" into stage-aosp-master
am: 78d17025e8

Change-Id: Ide6e0120b57228d2dd4c9895abf716f18b41b1fa