Merge "Fix an infinite loop with network offers" am: 77992bbfbb am: 72ed43d6dc

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

Change-Id: Ib159fb6bf7437028a01e18c69fbf972598053f6b