Merge "Change the way tombstones are added to dropbox." into main am: 6d26e8efcd am: d5854bc0e3 am: 170d5e3967

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

Change-Id: I6b086f9edf258333e8660d17c4d12df61a9de74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>