Merge "Instrument captive portal login activity" into stage-aosp-master am: 858ed182d6  -s ours am: 2380d0e286  -s ours
am: 34386cb564  -s ours

Change-Id: Iba621782c0b329db2518c337fd524f75b82deb41