Revert "Seperate DeviceManagerService into System-service so."