Merge "Fix VirtualDeviceManagerServiceTest failure" into main