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

[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5b am: 0d82d9ff am: a4fbde56 -s ours am: b1b23547 -s ours am: 29802fb3

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

Change-Id: I5c486e1282f8d30f8326075345c68176ae77560c