Merge "Instrument captive portal login activity"
am: b213053def

Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207