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

[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d8 am: 53f1a99f am: 18b5a534 -s ours am: 0b212d65 -s ours am: a9f6ccf9 am: dae7a346 -s ours am: 6a2eb025

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

Change-Id: Ic0c9825bd60f6b8143ee62a75865c08387979ac9