Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71

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

Change-Id: I9bc8d90381baf74cfe38bc0f30f61a284c86f339