Merge "Instrument captive portal login activity" am: b213053def
am: 30b7dfb526

Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891