[automerger skipped] wifi(vts): Use blocking getService to wait for service to come up am: 2329bba9fe -s ours am: 1deae073f4 -s ours

am skip reason: Change-Id Ia05f93ba4a28c036315558edbba30f19c2e6ac95 with SHA-1 6d0af445ee is in history

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

Change-Id: I33c3605239091c72a51306694e40ea153d35d5cd