Merge "fix broadcast receivers overflow for system_server" am: 9ba1a0d5 am:...

Merge "fix broadcast receivers overflow for system_server" am: 9ba1a0d5 am: ad946733 am: ea66dd6c

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

Change-Id: Ibf885fb006911469005ea075e60f8c2d3e8dc8e7