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: I638dcb91d51989bc7cf0f4d01a4f013689db2b50