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

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

Change-Id: Ib2f5f8f6913c93b0f4fa2aeceb9113cb654a3b14