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

Change-Id: I234d55c758c7538717d27035fdc8864a8650d75c