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

Change-Id: I8b899023b0977e4a8963cc536602ced4f7e43769