Merge "Revert "Revert "Test eventuallyExpect""" am: 6554553825 am: ae81c18fba am: ed5cfe652a am: 6093d89e95

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

Change-Id: I8d4b0e33a2114bcb42fe7713c3958d27f361fb48