Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109

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

Change-Id: I3225993e2ac623c991cbc21f5c00bf9df38149d7