Merge "Match create_composite_disk to crosvm updates" am: d25763e704

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

Change-Id: I8e286a8d037fafbfe31edd7391b3cdbe8e84b1e8