Merge "fix broadcast receivers overflow for system_server" am: 9ba1a0d576

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

Change-Id: I21973fa539299a967dc78161a57fa467a99912c3