Merge "Add proto tombstones to Dropbox." am: 3361ca6c56

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I197a71c2b6ab45deedbd746408f88ff706c296e5