Merge "Revert "Change the way tombstones are added to dropbox."" into main am: 9c7660952f am: f472abbada

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

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