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

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

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