[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

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

Change-Id: I4690edcbf08069880e61092c12b2f79784824cc0