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

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



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