Revert "Wifi: Move supplicant service init to wpa_supplicant"

This reverts commit 788012640b

Reason for revert: Caused throughput issue in p2p b/187302501

Bug: 187302501
Bug: 186636898

Test: boot and wifi function is ok
Test: p2p connection and throughput tests.

Change-Id: I70f4015040f10452acff697ee504b02cfb3c1e27

BoardConfig-common.mk

@@ -341,7 +341,6 @@ WIFI_FEATURE_IMU_DETECTION := true
 # Avoid Wifi reset on MAC Address change
 WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
 WIFI_FEATURE_HOSTAPD_11AX := true
-WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 # NeuralNetworks
 GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)

conf/init.gs101.rc

@@ -501,6 +501,19 @@ service abox /vendor/bin/main_abox 17c50000.abox
     group audioserver
     seclabel u:r:abox:s0
 
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
+    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
+    -m/vendor/etc/wifi/p2p_supplicant.conf \
+    -g@android:wpa_wlan0 -dd
+    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
+    socket wpa_wlan0 dgram 660 wifi wifi
+    class main
+    disabled
+    oneshot
+
+
 # GPS
 service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf
     class main