Merge "TestOnly: disable some UpstreamNetworkMonitor tests after T"