[automerger skipped] Apply diffs to screenshot action updates am: f1e70448 -s ours

am skip reason: Merged-In I5753511ad7c3ebbe189948ffc10cf2c02ef5b688 with SHA-1 0d04bdb4 is already in history

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



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