[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into pi-dev...

[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into pi-dev am: 7f07c974 -s ours am: b9366942 -s ours am: fda6e831 -s ours am: 6303b954 -s ours

am skip reason: Change-Id I212ca5f1a48174ed85311b551259da314718f082 with SHA-1 2a92eea7 is in history

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

Change-Id: Ib21e2965d900c5f184afcba6d23ece5f129f60a0