Merge "[automerger skipped] Prevent system server crash while start activity failed. am: 380626cf54 am: 4c2600abe1 -s ours am: 4879ec82db -s ours am skip reason: change_id I7949dc1effcc171834f6bc3ff0333f9090b58480 with SHA1 380626cf54 is in history"