tree bef8743e285afb16b29259069c05f531bc7463a6
parent 46e4b638def60a7a4549461d515644a072fb67ff
parent a1b73317226d3ccae0477179669f17a1ffb209ab
author Josh Gao <jmgao@google.com> 1613645364 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613645364 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I490ba33c58b47c29f0c828bd0f1bcbe7f1eb24c0