Do the clean-up in the worker thread am: ab6691c97d

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

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