Merge "Merge "[AM] Fix system server may killed when monkey crash." am: 21ed56da am: ef4267e5 am: e2ccdd9d am: fe9e70db"