Merge "Revert "Match create_composite_disk to crosvm updates"" am: 51345a7c8b

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

Change-Id: Ie6207c056f84f984d8138b82ca460bb42accfc60