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

Change-Id: I6a84a0960ea4262c9f0b363ee970c7666a1c7648