Merge "Ensure ACTION_EMERGENCY_CALL_STATE_CHANGED doesn't send on GSM." into pi-dev