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

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

Change-Id: I1521e4022529473614676a3c67658b23328bbaaa