[automerger skipped] Merge "Rate limit dropbox entries in...

[automerger skipped] Merge "Rate limit dropbox entries in ActivityManagerService per process and add a test for the rate limiting." into tm-dev am: 3735778a am: cab03a4f am: 6592af67 -s ours

am skip reason: Merged-In I08ccc151a3af867360ec8376725679bcfb92f4f6 with SHA-1 b4167cca is already in history

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



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