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

Change-Id: I8090a26efa655ac9c753a0826ed2f053a5d7d27e