Merge "Long screenshot fixes for apps that return less than the requested...

Merge "Long screenshot fixes for apps that return less than the requested rect" into sc-dev am: 18650530 am: e1636629

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

Change-Id: Ie748e1ed199682e51597e8aa2ba7cb1757d77154