Merge "Revert "Instrument captive portal login activity"" am: 29213205 am: bbddbfc4 am: 56057f2b -s ours am: 24fa587e Change-Id: I05ec98c49e4c7242d75f867363f1dbf033f1a022