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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I750c42d890dc79c2010841690e2e03818d232301