[automerger skipped] Prevent system server crash while start activity failed. am: 380626cf54 am: a6be7c3d44
am: 6672d870e5 -s ours
am skip reason: change_id I7949dc1effcc171834f6bc3ff0333f9090b58480 with SHA1 0c0fb22eab is in history

Change-Id: Iad915dee3f0918aae33ce4b22ec891c7d1b14305