Merge "Handle SSL errors in CaptivePortalLoginActivity"
am: c6c06b004e

Change-Id: I553a94c8e210fc26cd5004f7a2badbd1dcc70bc7