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

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

Change-Id: I7a952ff80ce9f68c6a7a6a432799cc1b5b7d1b49