Merge "Merge "Restores a capture rate limit for long screenshots" into tm-dev...

Merge "Merge "Restores a capture rate limit for long screenshots" into tm-dev am: 82c77bb1 am: 2339eec1" into tm-d1-dev-plus-aosp am: 738431a6

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



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