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

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

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