Merge "CaptivePortalLoginActivity correctly gets UserAgent"
am: 4903487fd9

Change-Id: Iea24e914cab4128464f8866a4b9ae47c7c5325bf