The long answer is NO. Because humanist studies have this blurred line of what is certain and what can only be speculated about. Depending on what criteria you will use, whose definition will be determining line or what part of source material you will consider.
For example, a scholar from USA can use this definition American Heritage Dictionary. Which states
The systematic propagation of a doctrine or cause or of information reflecting the views and interests of those advocating such a doctrine or cause.
While the same dictionary but third edition give us
Propaganda is defined as the dissemination of ideas, facts or allegations with the expressed intent of furthering one's cause or of damaging an opposing cause.
So with this somebody using third edition could not count PSA "Black death is coming, vaccine your children" into propaganda. While at the same time somebody using fifth edition would say that every PSA is propaganda.
The short answer is Yes. In general we treat as propaganda everything that is untrue, unchecked or biased served as truth, fact or law.
Training films are movies that show verified information in form of dramatized scenes.
PSA are pure information that is aimed to explain and show how to act in certain, usually life threating, situation.
A STUDY IN MOTION PICTURE PROPAGANDA that use definition of propaganda from third edition of AHD. The study was written in 2005 so 5 years AFTER Fourth edition was published. So by the time the study was made the definition used in it was already different from the "actual" one. So using outdated tool while newer one was available.
This is just work on Hollywood made movies made by American author.
European scholar (for example polish one) could use this definition:
technique of controlling views and behaviour of people consisting on intentional, importunate connected with manipulation influence on community
Notice the controlling and manipulation.
Again, a demarcation criteria cannot be established as cognitive tools differ in just one category of movies (propaganda in this case).
Scholars could came to an agreement regarding mentioned three topics when talking about specific movies (specified to version and date of release) but not about whole genres. And I would assume that said agreement would only be obligatory for the time and people who partake in said deliberation.