Merge "Change the way tombstones are added to dropbox." into main am: 6d26e8efcd am: d5854bc0e3

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

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