[automerger skipped] Merge "Remove NetworkMonitor dependency on ICaptivePortal" am: bfe928d5 am: 8a4908c1
am: 84d7c7e1 -s ours
am skip reason: change_id Ib6a89e54312628662b130fbeec18d11e139f09fa with SHA1 5a1b74b6 is in history
Change-Id: Id24f7fd07472e541d109c6fd08be78bdc2c2bf6a