[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 skip reason: subject contains skip directive

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

Change-Id: I3f9f709558f3a9e5c52fdc847115bbb7469a8b5a