Merge "Increase timeout to deflake tests" into main am: 32a8cbce6f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678020

Change-Id: Id16fd3a1102858de6f0ba046e6d3cdf24ed457d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>