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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic17d60aee710d982cf6ee33e4fe0446a0a4d35e1