Merge "Instrument captive portal login activity" into stage-aosp-master
am: 858ed182d6  -s ours

Change-Id: Ia9a74f588f8600bf2e453d7e7f1b5e1a818c432d