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

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

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



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