Merge "Revert "Instrument captive portal login activity"" am: 2921320517
am: bbddbfc451

Change-Id: I0271fa4138ac9c4f1ddfea648c003a79909214df