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

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

Change-Id: I1a16a561a7656b3450cf67a8188f1463a65b8334