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

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

Change-Id: Ie5033654cae39becb73560d601b2abc88968e4e5