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: I525d16324574725d27fac95211af3d5d4421ef23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>