Merge "Fix rate limit API review comments" am: a45195924e

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

Change-Id: I665c271994a63c8f8383da26bbe3aba993d1d5b2