DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df

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

Change-Id: I48a72258c4bdf1a3f9841c36165675c6e2c99cda