[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: 523686c5 am: d57c2cec -s ours am: 9f188f38

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

Change-Id: I38ef0470f95853590397c248dcba18bc56199074