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: f819a023 am: aeac9c5b am: f13c2dac

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



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