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: 9c8520dd

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

Change-Id: Ifa4c99fe979121c689a4a0a1d26c66aa41da1918