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

[automerger skipped] Merge "vts: supplicant: Remove optional service registration" into android10-tests-dev am: dd3fa3ea -s ours am: fbc735c5 -s ours

am skip reason: skipped by user rpius

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

Change-Id: Ia3519bdfb7929dd5190743a88bbb372fee3bcf1f