Merge "[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into pi-dev am: be1f0f2863 -s ours am: 8b691cfcea am: 547f99bbda -s ours am: f9052f7905 am: 3215114ad6 -s ours"