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

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

Change-Id: Ie6368831879559fa3a1c8372927b58c74e32b0ae