[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot...

[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-mr1-dev am: 09b6ab6b -s ours am: 6a3d33df -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifedb412a5aeff6351a1ec3da61bd4113908ad331