Merge "DO NOT MERGE Instrument captive portal login activity"
am: 778ade9073  -s ours

Change-Id: Ie493a705d3c60958037b0128195ee4ac85329d8b