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

Merge "Increase the active broadcast delivery limit to core components." into udc-dev am: dad2f513 am: d93036c6 am: 64639de7 am: 39dc6c49

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



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