Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f535 am: d5174ac6 am: d394285f am: d1a05995 am: a631781c Change-Id: I05e774c27eec657afdafe68f869ee47611924de4