Merge "Remove dead non-proto tombstone reporting code." am: f7187071 am:...

Merge "Remove dead non-proto tombstone reporting code." am: f7187071 am: 9d098cad am: fc8c33a7

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

Change-Id: Id744d7c7a3e7d9da2f906e9da905185f349e59fe