Merge "Remove NetworkMonitor dependency on ICaptivePortal"
am: 399be8f9b9

Change-Id: Ia0d06e1aa931cdc1c6dd4008e804a6a44ae2304f
tree: 000c0dcc885384c9402eb9f5adef13dbaa5c5d63
  1. core/
  2. services/
  3. tests/