[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: 291e6791 -s ours am: 9a40ddef -s ours am: 856c1993 -s ours

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

Original change: undetermined

Change-Id: Ib538d4d220a98d738014139acfcc7d1c4cb83274