Merge "Match create_composite_disk to crosvm updates" am: d25763e704 am: 4e3956fcb8

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

Change-Id: Iaaf0aeb052defce9a107d043b95a2dc3a7aceeef