Merge "Add eventuallyExpect overload" am: 17c4212953 am: b76e0fe730 am: 133d3699ea

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1413547

Change-Id: I2d384be7ebb23af1670d6de6169504e5ec9c4ab7