Merge "NativeTombstoneManager: track proto change." am: 5e3543c626 am: 9dc77df4b6

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

Change-Id: Id01822def93f911af8d913ad5772e3dcab88b169