Merge "Revert "Revert "Match create_composite_disk to crosvm updates""" am: 8cdd0cad5a

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

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