Merge "Generate text tombstones from proto tombstones by default." am: 8c164946d8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I572db2cc334e996c9730bc2563367f35205ea02c