Merge "Make tombstones 664." into main am: d3fb7a63

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



Change-Id: I9122be975b468dfdaa017a79d8fee154d14bf124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>