Merge "Record tombstone proto file's timestamp into the dropbox" am: cbcb665dee am: 48a54513c8 am: 0017457118

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

Change-Id: I0941d11e59982e89aeb8f77179b2d45d08dc47ac