Merge "Revert "Revert "Test eventuallyExpect""" am: 6554553825 am: ae81c18fba am: 7bc627087b

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

Change-Id: Iead7b0172b6c4c9d5c6940d34ecb05bc94e93e48