Merge "Revert "Test CompOS more directly."" am: 7067ac4dc8

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

Change-Id: I66333d456110afbc05d89e3bd746eb1972aa80eb