Merge commit 'bd3694848ca9ad983252a4b8b3d5b5a16a4550d3' of sso://googleplex-android/platform/packages/modules/CaptivePortalLogin into HEAD
Change-Id: I0233a743eb2724efd9fa18b8e86002a243e159f8