[automerger skipped] Make screenshots leaving the device more consistent. am:...

[automerger skipped] Make screenshots leaving the device more consistent. am: 7986a3a2 am: 1713e8a3 -s ours

am skip reason: Merged-In Idb3c6d0778d522d1487baaffba36fae5d7b0d524 with SHA-1 ffb3221d is already in history

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



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