Merge "Remove non-tombstoned ANR path." into pi-dev-plus-aosp