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 am: 6ae2ac86

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

Change-Id: I043b68fc66c425cb8513e392141daaf66a736f1a