Merge "Increase ConnDiagsTest timeout for end-to-end test."