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

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



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