Merge "Instrument captive portal login activity" into oc-dr1-dev
am: 169f7bebce

Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f