[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 am: 2df3d9fb am: 0feebb84 am: 6f0c6390 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5a222ae937b75bd18092a45feb1d26285e85d344