Merge "Fix a flake where network caps change innocuously." am: da5e11c95f am: 9245e8f16f

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

Change-Id: Idbdd4c56560bdf3ae41582e5b98ede213054f636