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

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

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