Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev