Merge "Add tests for NetworkMonitor isCaptivePortal"
am: 97ff63812c

Change-Id: I78fdda16ef8754cc2ccc429dba5638c1b44a40de