[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823a am:...

[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823a am: 51ed0f97 am: e0862c05 -s ours am: 5b227475 -s ours am: c2407e7e am: 37ba307e -s ours am: e72846f5

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

Change-Id: I96c0a257cb9572892181d8fcfec329d3e3138f57