Merge "Make virtual_device_service accessible from CTS"