[automerger skipped] Merge "vts: Fix incorrect instance name in Teardown" am:...

[automerger skipped] Merge "vts: Fix incorrect instance name in Teardown" am: 19cc21ea am: 5679f915 -s ours am: f6841c32 -s ours am: d7f1b09d -s ours

am skip reason: Change-Id I8215cba3e2a36f48863f57e199684c7446e20692 with SHA-1 a6cc5825 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427816

Change-Id: I7729babd6ab80aa7e89763434574909b402a2016