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

Change-Id: Ibd569d8ad58a5631a1c1fcceca0e342c960f1660