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

Change-Id: I829756bc1b6277abd77a86e8e6a0e895bb55db80