Merge "Add tests for NetworkMonitor isCaptivePortal" am: 97ff63812c am: aebb44fd8e
am: 238f479b66

Change-Id: I0f93d8a475a949e61e9f2b8e8116c241ae68faaf