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

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

Change-Id: I7b76b72370c55040c28b7b599adfacec3eec79c3