Merge "Remove non-tombstoned ANR path."
am: 79474267d3

Change-Id: I6bbd1cac24fe21e35bfe8d282a3a0a7a6f572ff0