[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: fcd53961 am: 130d46dc am: 3f4c17a3

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

Change-Id: I5939d790f5dbf7993e04def9f887f07e1e2be738