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

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

Change-Id: I92452b90c8b11ac014657f8cfcf417febf36c840