[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df am: e0862c053d -s ours am: 5b227475ab -s ours am: c2407e7e8c

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

Change-Id: I3a0512efe72d2f26d752ad79006e619fc27dc5aa