[automerger skipped] Merge "supplicant(vts): Stop adding empty instance for...

[automerger skipped] Merge "supplicant(vts): Stop adding empty instance for vendor HAL" into android11-tests-dev am: f9a770a3 -s ours

am skip reason: skipped by user rpius

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

Change-Id: I86d0b5f3edfbf83d43919d5ff08c2431efd61646