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

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

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