Merge "Add tests for NetworkMonitor isCaptivePortal"