Merge "Extend timeout to deflake test" am: f7c071b1c4

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

Change-Id: I106af9df7be12659cebff2f088b98a19eadbb244