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

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

Change-Id: Ib91ceae2b4496b53e858ee8f2de298b4eddce86d