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

Change-Id: I783d4e601bed3ea3d47c34baa6d05478a21cb2eb