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

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

Change-Id: I0de4ba105b5ce791127ca22e5966bb650fe85316