Merge "Add support for multiple GKI versions on VM" into main am: 484971b68a

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

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