Merge "Update the rate limiting parameters to be a bit more strict in...

Merge "Update the rate limiting parameters to be a bit more strict in limiting, but keep the buffer longer before reset." into tm-dev am: 7d302d09 am: 694bcf3f am: bb5f88e7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029562



Change-Id: I1fb641ba1d349104f71310d1f7063ed2f26d661e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>