Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp