Merge TQ2A.230405.003

Bug: 271343657
Merged-In: Iddb8619be7bdd9767211e44913e8ba3871bc6580
Change-Id: Ia02a1c751784f56264360e1a8791df072bd5b197
diff --git a/device-barbet.mk b/device-barbet.mk
index b057ead..5e2ccb8 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -205,3 +205,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