Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE

Merged-In: I2028c8d7629783c605287a1ed4073530f16d9540
Merged-In: I11c7a6f799558d0e88f0949b1225b8af96ac03ab
Merged-In: Ib3ce8d6670a929d9ee94a8242f0e0c80208745a3

Change-Id: I4cd863b04bbd5723c6e4e679a321d927f6508f8a
diff --git a/barbet/init.barbet.rc b/barbet/init.barbet.rc
index ecf1a5e..e909144 100644
--- a/barbet/init.barbet.rc
+++ b/barbet/init.barbet.rc
@@ -37,6 +37,7 @@
 
 service vendor.mdm_helper /vendor/bin/mdm_helper
     class core
+    user root
     group system wakelock
 
 on early-fs && property:ro.boot.hardware.revision=DEV1.0
diff --git a/device-barbet.mk b/device-barbet.mk
index 5d37798..705307c 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -53,7 +53,8 @@
 LOCAL_PATH := device/google/barbet
 
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/barbet
+    device/google/barbet \
+    hardware/qcom/wlan/legacy
 
 PRODUCT_PACKAGES += \
     libtasspkrprot
@@ -205,3 +206,7 @@
 
 PRODUCT_COPY_FILES += \
     device/google/barbet/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml
+
+# Workaround for Qualcomm neural network HAL
+PRODUCT_PACKAGES += \
+    libprotobuf-cpp-full-3.9.1-vendorcompat