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

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

Change-Id: I4f7b3639f8e80ea0ea60c47d24dd1b7da4f2b5ea
tree: 976f4767657eb1ee658799311cb346a08ccf92f1
  1. tests/