[automerger skipped] Merge "Remove non-tombstoned ANR path." am: 79474267d3
am: 67f81c4514  -s ours

Change-Id: I2ff3e8303e8ba587c2496dd1d2336229bf92a400