[automerger skipped] Merge "Increase ConnDiagsTest timeout for end-to-end test." into rvc-dev am: 2658b1f70a am: 1f1a824e64 -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: I3bc68a4a10309db9490a4741411d357203ff429a
tree: 976f4767657eb1ee658799311cb346a08ccf92f1
  1. tests/