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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0778d7611c8de7b6e32a76da221c8fe1b2d03ce4