Merge "Fix a flake where network caps change innocuously." am: da5e11c95f am: 32d512fafa am: d83bc28c2e

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

Change-Id: I194310a01d192d3f82713bace8248f1b1548e2e9