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

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

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