Merge "Data written to instance.img has schema" am: f04e45daee

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

Change-Id: Ic66650db6b223a9743d320e034a58187ab3fe0ba