Merge "NativeTombstoneManager: catch ProtoParseException." am: ecc474af3b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia22a9cfdd73b1b8ad937d9561458e509aba9b23e