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

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

Change-Id: I6bc751be26c4166457b5c870c687bd463cad0d7b