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

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

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