Merge "Restores a capture rate limit for long screenshots" into tm-dev am:...

Merge "Restores a capture rate limit for long screenshots" into tm-dev am: 82c77bb1 am: 26624226

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



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