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

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

Change-Id: I0c72fae04ad53bb77bce00bfaf77b3d65b0d4ab5