Merge "Manage name->VM mapping in VMM" am: f452d6f9ba am: 8196ab4757

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

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