Remove underscore from Companion service name

Fixes: 37536706
Test: Ensure no boot-time error and companion functionality works
Change-Id: I80ced92cb62aa10e1847980eb9a169af3bcd21f0
4 files changed