[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: fe345ccb -s ours am: 93874884 -s ours am: cf379e82 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ida9d6ca29bd7b3bb1fc87c59e5d7f40f416ee10b