[automerger skipped] Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109 -s ours

am skip reason: Merged-In I091991aac8eb11319bd60dc8f07124ace1ad52f1 with SHA-1 f3d8c6f70e is already in history

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

Change-Id: I44d25f1cb3e93bcdbedf424927d42f2c4d1e16b1