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

Change-Id: I6e0b3c5ab67449d11b1e4c0be0d16c322ae380f0