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