Merge "tombstoned: Rename proto tombstone before text tombstone." into main am: e0b55e5a

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



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