[automerger skipped] Merge "Increase ConnDiagsTest timeout for end-to-end test." into rvc-dev am: 2658b1f70a -s ours am: 86b65ff3b3 -s ours

am skip reason: Change-Id I36347f6d52e3ce1bd30e3f74c35f4ecd15c8c65e with SHA-1 c8d9a5706e is in history

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

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