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