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

Change-Id: Ifc9f7626848727161f938f44b26e756dbf664588