Make intents immutable am: f4619d699f

Original change: undetermined

Change-Id: I2542bbe0ff1f2e9019f2055e0a453b3d83b57974