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

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

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