Merge "[vs] Refactor directory removal in virtualizationservice" am: 0ce116f520 am: 8c1665ece9

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

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