Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp
am: 44d0cda8ef

Change-Id: I5bf2282984b9ed40d838cb6ae30c4ab694a8e160