Merge "Make tombstones 664." into main am: d3fb7a6355 am: 19a8e857a7

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

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