Merge "Instrument captive portal login activity" into oc-dev-plus-aosp