Merge "Fix assertEventuallyTrue timeout" into main am: bb3b38d71e am: 7baa08fff4

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

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