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

Change-Id: I891b08f10b0c39f46d9522d53063035249b0e05d