Merge "NativeTombstoneManager: fix tombstone parsing." am: 35a5c1501f am: 76528d5388

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5262153df4454d1ee3cf00106f3d26bd36309bd4