Merge "Increased the timeout from 5 to 30 seconds" am: 7e60552183 am: ab103aeca1

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

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