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

Merge "[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: 2b42f2d9" into rvc-qpr-dev-plus-aosp am: 6bce44e0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id1800216c60b372cdd63f9df61a4fef64f61bb3c