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

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

Change-Id: I80cde04202b62632f8422fee14983426a0f8c306