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 am: 1b96d19f

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



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