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

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

Change-Id: Ida8fa532182f7e63b0cac5be24843437a3ab4600