Merge "Move NetworkMonitor to NetworkStack" am: 81552d610a
am: 8ecc6c9e32

Change-Id: I438b95e135d0d86be53ea3a8ab61105a886e2a2e