Merge "Extend timeout to deflake test" am: f7c071b1c4 am: 397d49e07c am: e78171b2c9

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

Change-Id: I94a966624b87c0d8b46d6f7f72d9e0211510c3a3