Merge "Limit the size of the screenshot message area" into tm-qpr-dev am: 204075c6

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



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