Merge "Fix too many receivers Exception" am: 2e6cde6b94 am: 8c2b2cc806 am: f83f554a75

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I994084cd157a33e74a07525e6dd61229069fbdd7