Merge "Fix too many receivers Exception" am: 2e6cde6b94

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id69d676c8386f74a7e642984ea7387baacd2711c