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

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



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