Merge changes from topic "reland-remove-vendor" am: 778df58236

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

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