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

Change-Id: Ia8a9105404399901ca633a8f883ffa5be8f9548b