Merge "Revert "Instrument captive portal login activity"" am: 2921320517 am: bbddbfc451
am: 56057f2b55  -s ours

Change-Id: I22d9980ace64235c8b88417bb4b818a13cbb65e0