CaptivePortalLoginActivity cleanup for T&C

Minor cleanups in the CaptivePortalLoginActivity module and test.

Bug: 162785447
Test: atest CaptivePortalLoginActivityTest
Change-Id: Idc0c02d99d53b6f9aabd8f89a447fbdf533b3e1f
2 files changed