Merge "[Tether05] Migrate UpstreamNetworkMonitor into module"
am: 259fdbb0b3

Change-Id: I64ff858bb8a5ff63046f46a4cefd3ff10695f619