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

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

Change-Id: I52db528bcd4e7e8c56a22cc1d4ffe7178d8e1b5c