Merge "Increase ConnDiagsTest timeout for end-to-end test." am: a86ff10ecf

Original change: https://android-review.googlesource.com/c/platform/cts/+/1349068

Change-Id: I0ff154d73be81e1d7810c07409c0f64ddacd30ab