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

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



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