Merge "Instrument captive portal login activity" into stage-aosp-master