[automerger skipped] Merge "Also reset the dropbox rate limiter in BootReceiver in addition to ActivityManagerService." am: a12efe5b68 am: 3dd9282bdf am: 7496f576da am: d98bc16010 am: ea32f16da0 -s ours
am skip reason: Merged-In I5ee6d56281d579edf76c73acf81237f42939ead7 with SHA-1 262bfb1269 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2210236
Change-Id: I1202ab162ea26d22ea66ad14806f1a30e6bc24ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: