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

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

Change-Id: I5bbee5c3fe851a95b7674a2984ce03506fceb8f7