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: 4645dec4

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



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