[automerger skipped] Merge "Make implicit intent immutable." into qt-dev am:...

[automerger skipped] Merge "Make implicit intent immutable." into qt-dev am: 7974d158 am: 7b8b45e2 -s ours am: 52fd644b -s ours am: d5197d7a -s ours am: 95ff27f3 -s ours am: 21a7831e -s ours

am skip reason: Change-Id Ifee830595bb145aede4dad1d9e42a20e54b6be66 with SHA-1 e42611f8 is in history

Original change: undetermined

Change-Id: I006846dd2c223155acef41f1d69498b74d35a9f3