[automerger skipped] Merge "Add the ability to reset dropbox rate limiter with...

[automerger skipped] Merge "Add the ability to reset dropbox rate limiter with a shell command." am: 1a0d812c am: 7f94f53e am: d4e2ca0c am: 8749a09f am: 75871a8f -s ours

am skip reason: Merged-In I87b8c6e49c809d94a036ccac5d4381dba691e727 with SHA-1 9c5ebc4b is already in history

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



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