Merge "NativeTombstoneManager: catch ProtoParseException." am: ecc474af3b am: bfe2b8f496

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25af0d7437d4712c321f19aad78305e5245b51c4