Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed898...

Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed898 am: 06b10bfb am: c418f8e6

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

Change-Id: I10d218d6ce37a531cd5d2b4850cf1771c55a1414