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

[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-mr1-dev am: b6bf062e -s ours am: 6c5b7271 -s ours am: 9e262514

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

Change-Id: I6f9d9283b4aacad905f42804afbc0b1f2f8fc469