Merge "Add COMPANION_DEVICE_SERVICE to @ServiceName"