Merge "Stop adding large proto tombstones to dropbox." into main am: d1fb7e4a36

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

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