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

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

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