[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 am: 4c111e69 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I655e663c8ca9dd694654ef7152bac37823795d5f