Merge "Skip ANR for processes that have been killed" am: 9d9cf5b383
am: b35b5f2bd1

Change-Id: Iee85d717feac0d7652993d90d4157052dc4292c1