Merge "Fix an infinite loop" am: d96aff4f1b

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

Change-Id: I62f3f67c021d9cef84621246b9d62ffeea224bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>