Merge "Fix assertEventuallyTrue timeout" into main am: bb3b38d71e

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

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