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

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



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