Merge "Revert "Instrument captive portal login activity"" am: 2921320517 am: bbddbfc451 am: 56057f2b55 -s ours
am: 24fa587ed7
Change-Id: I05ec98c49e4c7242d75f867363f1dbf033f1a022
This commit is contained in: