Make screenshots leaving the device more consistent. am: 7986a3a2f6

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

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