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

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

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