[automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots...

[automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev am: 637a90a7 am: b7ee1736 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2ff7f4850eae62607ffdbc0000da46bb7506fd68