[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: 183083dd am: f7ef1a89

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

Change-Id: Ia34b4b69582e31ef15505c54c4807d1042085d0d