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