Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page" am: 1a80ff943d
am: 4e7830d866

Change-Id: I6a14e5e1ddbf6346e90c98b324a1760b0e3e8227