Merge "Revert "Revert "Test eventuallyExpect""" am: 6554553825

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

Change-Id: I380f6cf3f48d8482b856da2f60149298555764d2