Issue #3293926 by kingdutch, geekygnr, godotislate, m4olivei, longwave: Error decorating non-existent service when inner service's module not installed
(cherry picked from commit c0053e63)
Closes #3293926
No changes between 3293926-10point4 and 10.4.x
