Merge "DO NOT MERGE Instrument captive portal login activity" am: 778ade9073  -s ours
am: 5da98a422d  -s ours

Change-Id: Iffdc9cae102d54672d55274a8cad582b3b6d5f6a