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

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

Change-Id: I964424220f86d74a3a6433a088a5f11ee1fd6486