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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c80dee00f881cfa529fad32e51edb5008df87c3