Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master