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

Change-Id: Ieba6ed270bce8ef5051ee34dc39695d56bda903f