Merge "Remove dead non-proto tombstone reporting code." am: f718707191 am: 9d098cad90

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2013484

Change-Id: I357735a9227a33819deb6690d59dce4ba49a8bf5