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

Change-Id: Ibf1e20427fd9d369f4522df7bd4c8f6f0c33fd9b