Merge "Instrument captive portal login activity" into oc-dev-plus-aosp am: 50c561a3db  -s ours
am: d2e0cd827e  -s ours

Change-Id: Id47ea62bad68a60e2689c2e66dfa7870760a9b1d