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

[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into pi-dev am: be1f0f28 -s ours am: 8b691cfc am: 547f99bb -s ours am: f9052f79 am: d43cdd3e am: 77511ae5

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

Change-Id: I02178532baedeb74b96fed17a4a2b7a03ee7b12c