Merge "wifi(vts): Use blocking getService to wait for service to come up" into rvc-dev