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

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

Change-Id: Icad186f7a973ebf08a7b506561573a963d762d49