Merge "Don't leak threads." am: 9aeb36cd74

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

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