Merge "vts: hostapd: Remove optional service registration" into android10-tests-dev