Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f5357e am: d5174ac63d am: d394285fdc am: d1a0599537
am: a631781c48

Change-Id: I05e774c27eec657afdafe68f869ee47611924de4