Merge "Make compsvc works in VM" am: dd240f63ab

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

Change-Id: Id34e688fef49b066bbee49c93ba0a344ac94f648