[automerger skipped] Merge "vts: hostapd: Remove optional service...

[automerger skipped] Merge "vts: hostapd: Remove optional service registration" into android10-tests-dev am: 522a6b4d -s ours am: 3df2acfc -s ours

am skip reason: skipped by user dmulabagal

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

Change-Id: I4c07841a5c6906b1fc80437d5093351eb3603683