Merge "Reject services that are both critical and oneshot" into rvc-dev am: d172618e38

Change-Id: I6a17d256b26c28b0cb88d85f6c3c72e36db313fb