Merge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9
am: 43961ee6ae

Change-Id: I8f43e7868ce43e6d1837900cfd131f556832f1a8