[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: 03997786 -s ours am: 927e5671 -s ours am: 12e1e3a5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idda3084ca60518b3a111958b5b8924c8b48730b3