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

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

Change-Id: Ib40869281aecaa492045c60e2a08791ddd77381f