Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
am: 3425a6e5c7  -s ours

Change-Id: I1967f5540ff997645a8a2f69b4a7939a01fc69e0