Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am: e40bb555d8
am: 0522f09bac  -s ours

Change-Id: I606e306f6ec68ac015e32c5e3069cc6b2b32b50e