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 am: 4aade1d7 am: cfb450fb

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



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