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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ee9fb0eb59d7be9e9e7fe021bb22ef4eb5ef4c0