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

Change-Id: I6538b13b94a723e941d32709e96f8a5bdd0c06f8