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

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



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