Merge changes I71097c3a,I872a1b3e

* changes:
  supplicant(vts): Stop adding empty instance for vendor HAL
  Revert "wifi: remove wifi instance name string check"