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

Change-Id: I30209378df79cdb77a73adede642c326c2930836