[automerger skipped] Merge "Repeat proxy limit callbacks if we keep going above the limit." into sc-qpr1-dev am: 41b55287 am: 979587e1 -s ours

am skip reason: Merged-In I8d877d409863fdae9cffd43709b647d0c1edb440 with SHA-1 3b2091fa is already in history

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

Change-Id: Ie7bcb2755b6f6b9ea349f60bedb96811dd1abe25