Prevent system server crash while start activity failed. am: 380626cf54
am: a6be7c3d44

Change-Id: I319b4dc393c6e00744df2a90445be54c3b7e7338