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: 2339eec1

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



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