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

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

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