Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am: d23be95dd7  -s ours

Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9