DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
am: a61684feb4

Change-Id: I2e79e9fb5d2324d2b008bc1e4263d3bdeaf3752d