Merge "Fix Telephony crashes from bad broadcast receiver behavior."
am: 6f51720d3a

Change-Id: Ie59ffb337e6a3ace78eeee9bda41c70c8da2e432