Merge "Clean up instance tracking" am: ff00265371

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

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