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

Change-Id: I4b4194468b08a568963c8dd223d5192ae3041806