Merge "Revert^2 "Change the way tombstones are added to dropbox."" into main am: de8baa8aae

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

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