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

Change-Id: Ibd65beb3ba4968eac43b2255e8a3ffcb8d6976f9