[automerger skipped] Merge "Repeat proxy limit callbacks if we keep going above the limit." into sc-qpr1-dev am: 41b552872d -s ours am: 33ce06521d -s ours am: a1e0445b82 -s ours

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

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

Change-Id: I4d4e6ea6de81d3db89ef43ca8b0e31c174bdbb25