Merge "Change DropboxRateLimiter to rate limit proto tombstones and regular...

Merge "Change DropboxRateLimiter to rate limit proto tombstones and regular tombstones separately." am: ab294c72 am: 18225e86 am: fd21b75a

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



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