Merge "Extend timeout to deflake test" am: f7c071b1c4 am: 177ffffd25

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

Change-Id: I26616ab172aa98b015437144b2b1fcd1a3d7973a