Merge "Fix VirtualDeviceManagerService startUser crash"