Merge "Instrument captive portal login activity" am: b213053def am: 30b7dfb526
am: d614cd3509  -s ours

Change-Id: I71166b2679994e342ca72398c68f6751ee2d5fa3