Merge "[AM] Fix system server may killed when monkey crash."
am: 21ed56daac

Change-Id: I0a556d253099eab172ac297cb3e799b9095ef853