Merge "Restores a capture rate limit for long screenshots" into tm-dev am: 82c77bb1 am: 2339eec1 am: cb9ea223 am: 1edab8c5

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



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