Merge "Merge "Increase the active broadcast delivery limit to core...

Merge "Merge "Increase the active broadcast delivery limit to core components." into udc-dev am: dad2f513" into udc-dev-plus-aosp am: 61e4a0f5

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



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