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

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

Change-Id: I20b9c4502a8d61ed8b5c85b45f212d2b1a5219f8
tree: 015e0dbd72df0208020a1e177e5d7a1e6f92a992
  1. staticlibs/