DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 22569ca49a -s ours
am: b18218fb06 -s ours
Change-Id: Icf09b29bfe619ee56d4e9ae0d640ed00fbb4ef31
This commit is contained in: