[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 am: 378d3ae5 -s ours am: 8254a628 am: baf4c150 am: aa8904e1 am: 7306373e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0eb65f9c7c8eca36cd54f89a5e79833b6cfc11a2