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: Ic5ae79d17796c0a8de040e45a282ff41bf443b95