Merge "Increase ConnDiagsTest timeout for end-to-end test." into rvc-dev am: 2658b1f70a

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

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