Merge "crosvm merge: updated create_disk_file arguments" am: f5d5818706

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2115879

Change-Id: I2a2e6bdececcb017ac99a38d9f482d794f190d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>